make attributes field required in ingest config

NYCPlanning · Oct 16, 2024 · 2b856c3 · 2b856c3
1 parent f2ecc05
commit 2b856c3
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 3 deletions.
diff --git a/dcpy/models/lifecycle/ingest.py b/dcpy/models/lifecycle/ingest.py
@@ -82,7 +82,7 @@ class Template(BaseModel, extra="forbid"):
     id: str
     acl: recipes.ValidAclValues
 
-    attributes: DatasetAttributes | None = None
+    attributes: DatasetAttributes
     ingestion: Ingestion
     columns: list[Column] = []
 
@@ -108,7 +108,7 @@ class Config(SortedSerializedBase, extra="forbid"):
     version: str
     crs: str | None = None
 
-    attributes: DatasetAttributes | None = None
+    attributes: DatasetAttributes
     archival: ArchivalMetadata
     ingestion: Ingestion
     columns: list[Column] = []

diff --git a/dcpy/test/connectors/edm/resources/ingest.yml b/dcpy/test/connectors/edm/resources/ingest.yml
@@ -1,5 +1,7 @@
 name: test
 acl: public-read
+attributes:
+  name: Test
 source:
   type: local_file
   path: dcpy/test/connectors/edm/resources/ingest_output/test.csv

diff --git a/dcpy/test/connectors/edm/resources/ingest/config.json b/dcpy/test/connectors/edm/resources/ingest/config.json
@@ -1,6 +1,9 @@
 {
     "name": "test",
     "version": "ingest",
+    "attributes": {
+        "name": "Test"
+    },
     "archival": {
         "archival_timestamp": "2024-09-05T12:04:03.450135-04:00",
         "raw_filename": "dummy.csv",

diff --git a/dcpy/test/connectors/edm/test_recipes.py b/dcpy/test/connectors/edm/test_recipes.py
@@ -71,6 +71,7 @@ class TestArchiveDataset:
     config = ingest.Config(
         id=dataset,
         version="dummy",
+        attributes=ingest.DatasetAttributes(name=dataset),
         archival=ingest.ArchivalMetadata(
             archival_timestamp=datetime.now(),
             acl="private",

diff --git a/dcpy/test/lifecycle/ingest/resources/templates/bpl_libraries.yml b/dcpy/test/lifecycle/ingest/resources/templates/bpl_libraries.yml
@@ -1,6 +1,9 @@
 id: bpl_libraries
 acl: public-read
 
+attributes:
+  name: BPL Libraries
+
 ingestion:
   source:
     type: api

diff --git a/dcpy/test/lifecycle/ingest/resources/templates/dca_operatingbusinesses.yml b/dcpy/test/lifecycle/ingest/resources/templates/dca_operatingbusinesses.yml
@@ -1,6 +1,9 @@
 id: dca_operatingbusinesses
 acl: public-read
 
+attributes:
+  name: DCA Operating Businesses
+
 ingestion:
   source:
     type: socrata

diff --git a/dcpy/test/lifecycle/ingest/resources/templates/dcp_addresspoints.yml b/dcpy/test/lifecycle/ingest/resources/templates/dcp_addresspoints.yml
@@ -1,6 +1,9 @@
-id: dcp-addresspoints
+id: dcp_addresspoints
 acl: public-read
 
+attributes:
+  name:  DCP Address Points
+
 ingestion:
   source:
     type: edm_publishing_gis_dataset

diff --git a/dcpy/test/lifecycle/ingest/resources/templates/dcp_atomicpolygons.yml b/dcpy/test/lifecycle/ingest/resources/templates/dcp_atomicpolygons.yml
@@ -1,6 +1,9 @@
 id: dcp_atomicpolygons
 acl: public-read
 
+attributes:
+  name: DCP Atomic Polygons
+
 ingestion:
   source:
     type: file_download

diff --git a/dcpy/test/lifecycle/ingest/resources/templates/dcp_pop_acs2010_demographic.yml b/dcpy/test/lifecycle/ingest/resources/templates/dcp_pop_acs2010_demographic.yml
@@ -1,6 +1,9 @@
 id: dcp_pop_acs2010_demographic
 acl: public-read
 
+attributes:
+  name: DCP Population 2010 ACS Demographic Data
+
 ingestion:
   source:
     type: local_file

diff --git a/dcpy/test/lifecycle/ingest/resources/templates/dob_now_permits.yml b/dcpy/test/lifecycle/ingest/resources/templates/dob_now_permits.yml
@@ -1,6 +1,9 @@
 id: dob_now_permits
 acl: public-read
 
+attributes:
+  name: DOB Now Job Permits
+
 ingestion:
   source:
     type: s3