Update Sample Server Script

Author: ortegi

deployment/provider-ebird-init/.env

@@ -4,4 +4,5 @@ BASE_URL = "http://provider-ebird:17193"
 SAMPLE_BASE_URL = "http://sample-server:80/api"
 X_API_KEY = "managementApiKeyProviderEbird"
 SAMPLES_SERVER_ADMIN_TOKEN="2e21999e5a55"
-PROVIDER_ID="provider-ebird" 
+PROVIDER_ID="provider-ebird"
+SAMPLE_CONTENT_URL = "http://sample-server:80/samples"

deployment/provider-ebird-init/scripts/ebird_assets.py

@@ -9,6 +9,13 @@ def build_asset(url, metadata, desc, name, api_key, province=None):
     display_name = name.format(region=province) if province else name
     current_time = datetime.now(timezone.utc).replace(microsecond=0).isoformat().replace("+00:00", "Z")
 
+    keywords = metadata["keywords"][:]
+
+    if province is not None:
+        keywords.append(province.upper())
+
+
+
     return asset_id, {
         "@id": asset_id,
         "@type": "dcat:Dataset",
@@ -26,6 +33,7 @@ def build_asset(url, metadata, desc, name, api_key, province=None):
         "cbm:hasSample": f"sample-{asset_id}",
         "dct:title": display_name,
         "dct:description": desc,
+        "dcat:keyword": keywords,
         "edc:contenttype": "application/json",
         "dct:modified": current_time,
         "dct:issued": current_time,
@@ -49,14 +57,20 @@ def build_sample_asset(metadata, name, desc, asset_id, sample_base_url, provider
     """Create sample asset definition dict."""
     display_name = name.format(region=province) if province else name
     current_time = datetime.now(timezone.utc).replace(microsecond=0).isoformat()
+
+    keywords = metadata["keywords"][:]
+
+    if province is not None:
+        keywords.append(province.upper())
+
     return {
         "@id": f"sample-{asset_id}",
         "@type": "cbm:Sample",
         "dcat:distribution": [
             {
                 "@type": "dcat:Distribution",
                 "dct:format": {"@id": "HttpData"},
-                "dcat:accessURL": f"{sample_base_url}/samples/{provider_id}/{asset_id}",
+                "dcat:accessURL": f"{sample_base_url}/{provider_id}/{asset_id}",
                 "edc:proxyPath": "true",
                 "authKey": "x-api-key",
                 "authCode": provider_share_token,
@@ -66,6 +80,7 @@ def build_sample_asset(metadata, name, desc, asset_id, sample_base_url, provider
         "cbm:isSampleOf": asset_id,
         "dct:title": display_name,
         "dct:description": desc,
+        "dcat:keyword": keywords,
         "dct:issued": current_time,
         "dct:modified": current_time,
         "edc:contenttype": "application/json",

deployment/provider-ebird-init/scripts/main.py

@@ -25,6 +25,7 @@
 SAMPLES_SERVER_ADMIN_TOKEN = os.getenv("SAMPLES_SERVER_ADMIN_TOKEN")
 
 SAMPLE_BASE_URL = os.getenv("SAMPLE_BASE_URL")
+SAMPLE_CONTENT_URL = os.getenv("SAMPLE_CONTENT_URL")
 POLICY_DEFINITIONS_URL = f"{BASE_URL}/management/v3/policydefinitions"
 CONTRACT_DEFINITIONS_URL = f"{BASE_URL}/management/v3/contractdefinitions"
 ASSETS_URL = f"{BASE_URL}/management/v3/assets-cbm"
@@ -203,7 +204,7 @@ def create_asset_and_sample(metadata, url, name, desc, province=None, response_t
                 "PUT", PROVIDER_TOKEN, sample, response_type, asset_id
             )
         sample_payload = build_sample_asset(metadata=metadata, name=name, desc=desc, 
-                                            asset_id=asset_id, sample_base_url=SAMPLE_BASE_URL, 
+                                            asset_id=asset_id, sample_base_url=SAMPLE_CONTENT_URL, 
                                             provider_id=PROVIDER_ID,
                                             provider_share_token=PROVIDER_SHARE_TOKEN,
                                             province=province)
@@ -232,8 +233,12 @@ def main():
         )
 
     PROVIDER_PASS, PROVIDER_SHARE_TOKEN = provider_result
+
+    logging.info(f"\033[1;34mCREATED PROVIDER\033[0m")
     PROVIDER_TOKEN = provider_login(base_url=SAMPLE_BASE_URL, provider_id=PROVIDER_ID, password=PROVIDER_PASS)
-    
+
+    logging.info(f"\033[1;34mPROVIDER LOGIN\033[0m")
+
 
     for config in ASSET_CONFIGS:
         metadata = get_metadata(config["metadata_file"])

deployment/provider-ebird-init/scripts/metadata/hotspot_metadata.json

@@ -1,6 +1,7 @@
 {
   "title": "Species Observation Data",
   "description": "Data on species observed in various locations",
+  "keywords": ["ECOLOGY", "BIRD", "BIODIVERSITY"],
   "theme": "Biodiversity",
   "columns": [
     {

deployment/provider-ebird-init/scripts/metadata/observation_metadata.json

@@ -1,6 +1,7 @@
 {
   "title": "Bird Observation Data",
   "description": "Data on various bird species observed in different locations",
+  "keywords": ["ECOLOGY", "BIRD", "BIODIVERSITY"],
   "theme": "Wildlife",
   "columns": [
     {

deployment/provider-ebird-init/scripts/metadata/recent_checklist_feed_metadata.json

@@ -1,6 +1,7 @@
 {
   "title": "Observation Records",
   "description": "Records of species observations with location details",
+  "keywords": ["ECOLOGY", "BIRD", "BIODIVERSITY"],
   "theme": "Biodiversity",
   "columns": [
     {

deployment/samples-server/postgres/init.sql

@@ -26,11 +26,12 @@ CREATE TABLE IF NOT EXISTS samples (
     id VARCHAR(36) PRIMARY KEY,
     asset_id VARCHAR(255),
     path VARCHAR(255),
-
+    has_header BOOLEAN NOT NULL DEFAULT FALSE,
+    
     provider_id VARCHAR(36) NOT NULL,
 
     CONSTRAINT fk_provider
         FOREIGN KEY (provider_id)
         REFERENCES providers(provider_id)
         ON DELETE CASCADE
-);
+);

providers/provider-ebird/docker-compose.yaml

@@ -31,7 +31,7 @@ services:
 
   api:
     container_name: api
-    image: ghcr.io/wake-ua/ds-api-samples:ee17751
+    image: ghcr.io/wake-ua/ds-api-samples:20260312
     volumes:
       - ${SAMPLES_ROOT}/samples:/samples/
     restart: always