adjust tests

Author: ChristianBeilschmidt

geoengine/colorizer.py

@@ -309,7 +309,7 @@ def to_api_dict(self) -> geoengine_openapi_client.Colorizer:
         """Return the colorizer as a dictionary."""
         return geoengine_openapi_client.Colorizer(geoengine_openapi_client.PaletteColorizer(
             type='palette',
-            colors=self.colors,
+            colors={str(k): v for k,v in self.colors.items()},
             default_color=self.default_color,
             no_data_color=self.no_data_color,
         ))

geoengine/datasets.py

@@ -494,11 +494,11 @@ def upload_dataframe(
                         ),
                         on_error=on_error.to_api_enum(),
                     ),
-                    result_descriptor=VectorResultDescriptor(
+                    result_descriptor=geoengine_openapi_client.VectorResultDescriptor.from_dict(VectorResultDescriptor(
                         data_type=vector_type,
                         spatial_reference=df.crs.to_string(),
                         columns=columns,
-                    ).to_api_dict().actual_instance
+                    ).to_api_dict().actual_instance.to_dict())
                 )
             )
         )

geoengine/workflow.py

@@ -535,6 +535,13 @@ def save_as_dataset(
 
         session = get_session()
 
+        print(geoengine_openapi_client.RasterDatasetFromWorkflow(
+                    name=name,
+                    display_name=display_name,
+                    description=description,
+                    query=query_rectangle
+                ).to_json())
+
         with geoengine_openapi_client.ApiClient(session.configuration) as api_client:
             workflows_api = geoengine_openapi_client.WorkflowsApi(api_client)
             response = workflows_api.dataset_from_workflow_handler(
@@ -984,8 +991,9 @@ def data_usage(offset: int = 0, limit: int = 10) -> List[geoengine_openapi_clien
         response = user_api.data_usage_handler(offset=offset, limit=limit)
 
         # create dataframe from response
-        usage_dicts = [data_usage.dict(by_alias=True) for data_usage in response]
+        usage_dicts = [data_usage.model_dump(by_alias=True) for data_usage in response]
         df = pd.DataFrame(usage_dicts)
+        df['timestamp'] = pd.to_datetime(df['timestamp'], utc=True)
 
     return df
 
@@ -1005,7 +1013,8 @@ def data_usage_summary(granularity: geoengine_openapi_client.UsageSummaryGranula
                                                        offset=offset, limit=limit)
 
         # create dataframe from response
-        usage_dicts = [data_usage.dict(by_alias=True) for data_usage in response]
+        usage_dicts = [data_usage.model_dump(by_alias=True) for data_usage in response]
         df = pd.DataFrame(usage_dicts)
+        df['timestamp'] = pd.to_datetime(df['timestamp'], utc=True)
 
     return df

tests/ge_test.py

@@ -201,6 +201,7 @@ def _start(self) -> None:
                 'GEOENGINE__POSTGRES__PASSWORD': POSTGRES_PASSWORD,
                 'GEOENGINE__POSTGRES__SCHEMA': self.db_schema,
                 'GEOENGINE__LOGGING__LOG_SPEC': GE_LOG_SPEC,
+                'GEOENGINE__POSTGRES__CLEAR_DATABASE_ON_START': 'true',
                 'PATH': os.environ['PATH'],
             },
             stderr=subprocess.PIPE,

tests/test_workflow_storage.py

@@ -17,28 +17,29 @@ def setUp(self) -> None:
     def test_storing_workflow(self):
 
         expected_request_text = {
-            'name': None,
-            'displayName': 'Foo',
-            'description': 'Bar',
-            'query': {
-                           'spatialBounds': {
-                               'upperLeftCoordinate': {
-                                   'x': -180.0,
-                                   'y': 90.0
-                               },
-                               'lowerRightCoordinate': {
-                                   'x': 180.0,
-                                   'y': -90.0
-                               }
-                           },
-                'timeInterval': {
-                               'start': 1396353600000,
-                               'end': 1396353600000,
-                           },
-                'spatialResolution': {
-                               'x': 1.8,
-                               'y': 1.8
-                           }
+            "asCog": True,
+            "description": "Bar",
+            "displayName": "Foo",
+            "name": None,
+            "query": {
+                "spatialBounds": {
+                    "lowerRightCoordinate": {
+                        "x": 180,
+                        "y": -90
+                    },
+                    "upperLeftCoordinate": {
+                        "x": -180,
+                        "y": 90
+                    }
+                },
+                "spatialResolution": {
+                    "x": 1.8,
+                    "y": 1.8
+                },
+                "timeInterval": {
+                    "end": 1396353600000,
+                    "start": 1396353600000
+                }
             }
         }