From 9c766c0a4aa1c6093550bcb02bf04f3c277da747 Mon Sep 17 00:00:00 2001 From: krishnaglodha Date: Tue, 19 Nov 2024 14:28:31 +0530 Subject: [PATCH] fixed responses ro response for singular operations --- src/geoserverx/_async/gsx.py | 64 ++++++++++----------- src/geoserverx/_sync/gsx.py | 108 +++++++++++++++++------------------ 2 files changed, 86 insertions(+), 86 deletions(-) diff --git a/src/geoserverx/_async/gsx.py b/src/geoserverx/_async/gsx.py index 62db43e..68a97f8 100644 --- a/src/geoserverx/_async/gsx.py +++ b/src/geoserverx/_async/gsx.py @@ -135,11 +135,11 @@ async def get_all_workspaces(self) -> Union[WorkspacesModel, GSResponse]: # Get specific workspaces async def get_workspace(self, workspace: str) -> Union[WorkspaceModel, GSResponse]: Client = self.http_client - responses = await Client.get(f"workspaces/{workspace}") - if responses.status_code == 200: - return WorkspaceModel.model_validate(responses.json()) + response = await Client.get(f"workspaces/{workspace}") + if response.status_code == 200: + return WorkspaceModel.model_validate(response.json()) else: - results = self.response_recognise(responses.status_code) + results = self.response_recognise(response.status_code) return results # Create workspace @@ -150,12 +150,12 @@ async def create_workspace( payload: NewWorkspace = NewWorkspace( workspace=NewWorkspaceInfo(name=name, isolated=Isolated) ) - responses = await Client.post( + response = await Client.post( f"workspaces?default={default}", data=payload.model_dump_json(), headers=self.headers, ) - results = self.response_recognise(responses.status_code) + results = self.response_recognise(response.status_code) return results # Get vector stores in specific workspaces @@ -184,22 +184,22 @@ async def get_raster_stores_in_workspaces( async def get_vector_store(self, workspace: str, store: str) -> DataStoreModel: url = f"workspaces/{workspace}/datastores/{store}.json" Client = self.http_client - responses = await Client.get(url) - if responses.status_code == 200: - return DataStoreModel.model_validate(responses.json()) + response = await Client.get(url) + if response.status_code == 200: + return DataStoreModel.model_validate(response.json()) else: - results = self.response_recognise(responses.status_code) + results = self.response_recognise(response.status_code) return results # Get raster store information in specific workspaces async def get_raster_store(self, workspace: str, store: str) -> CoveragesStoreModel: url = f"workspaces/{workspace}/coveragestores/{store}.json" Client = self.http_client - responses = await Client.get(url) - if responses.status_code == 200: - return CoveragesStoreModel.model_validate(responses.json()) + response = await Client.get(url) + if response.status_code == 200: + return CoveragesStoreModel.model_validate(response.json()) else: - results = self.response_recognise(responses.status_code) + results = self.response_recognise(response.status_code) return results # Get all styles in GS @@ -215,11 +215,11 @@ async def get_all_styles(self) -> AllStylesModel: # Get specific style in GS async def get_style(self, style: str) -> StyleModel: Client = self.http_client - responses = await Client.get(f"styles/{style}.json") - if responses.status_code == 200: - return StyleModel.model_validate(responses.json()) + response = await Client.get(f"styles/{style}.json") + if response.status_code == 200: + return StyleModel.model_validate(response.json()) else: - results = self.response_recognise(responses.status_code) + results = self.response_recognise(response.status_code) return results # Add postgres db @@ -247,12 +247,12 @@ async def create_pg_store( ) ) Client = self.http_client - responses = await Client.post( + response = await Client.post( f"workspaces/{workspace}/datastores/", data=payload.model_dump_json(), headers=self.headers, ) - results = self.response_recognise(responses.status_code) + results = self.response_recognise(response.status_code) return results async def create_file_store(self, workspace: str, store: str, file, service_type): @@ -312,18 +312,18 @@ async def get_layer( self, workspace: str, layer: str ) -> Union[LayerModel, GSResponse]: Client = self.http_client - responses = await Client.get(f"layers/{workspace}:{layer}") - if responses.status_code == 200: - return LayerModel.model_validate(responses.json()) + response = await Client.get(f"layers/{workspace}:{layer}") + if response.status_code == 200: + return LayerModel.model_validate(response.json()) else: - results = self.response_recognise(responses.status_code) + results = self.response_recognise(response.status_code) return results # Delete specific layer async def delete_layer(self, workspace: str, layer: str) -> GSResponse: Client = self.http_client - responses = await Client.delete(f"layers/{workspace}:{layer}") - results = self.response_recognise(responses.status_code) + response = await Client.delete(f"layers/{workspace}:{layer}") + results = self.response_recognise(response.status_code) return results # Get all layer groups @@ -366,13 +366,13 @@ async def get_geofence_rule(self, id: int) -> Union[Rule, GSResponse]: # If the module check fails, return the GSResponse directly if isinstance(module_check, GSResponse): return module_check - responses = await Client.get( + response = await Client.get( f"geofence/rules/id/{id}", headers={"Accept": "application/json"} ) - if responses.status_code == 200: - return Rule.model_validate(responses.json()) + if response.status_code == 200: + return Rule.model_validate(response.json()) else: - results = self.response_recognise(responses.status_code) + results = self.response_recognise(response.status_code) return results # Create geofence on geoserver @@ -384,10 +384,10 @@ async def create_geofence(self, rule: Rule) -> GSResponse: if isinstance(module_check, GSResponse): return module_check Client = self.http_client - responses = await Client.post( + response = await Client.post( "geofence/rules", content=PostingRule.model_dump_json(), headers=self.headers, ) - results = self.response_recognise(responses.status_code) + results = self.response_recognise(response.status_code) return results diff --git a/src/geoserverx/_sync/gsx.py b/src/geoserverx/_sync/gsx.py index dd976db..33d75ce 100644 --- a/src/geoserverx/_sync/gsx.py +++ b/src/geoserverx/_sync/gsx.py @@ -152,11 +152,11 @@ def get_all_workspaces(self) -> Union[WorkspacesModel, GSResponse]: @exception_handler def get_workspace(self, workspace: str) -> Union[WorkspaceModel, GSResponse]: Client = self.http_client - responses = Client.get(f"workspaces/{workspace}") - if responses.status_code == 200: - return WorkspaceModel.model_validate(responses.json()) + response = Client.get(f"workspaces/{workspace}") + if response.status_code == 200: + return WorkspaceModel.model_validate(response.json()) else: - results = self.response_recognise(responses.status_code) + results = self.response_recognise(response.status_code) return results # Create workspace on geoserver @@ -168,12 +168,12 @@ def create_workspace( workspace=NewWorkspaceInfo(name=name, isolated=Isolated) ) Client = self.http_client - responses = Client.post( + response = Client.post( f"workspaces?default={default}", content=payload.model_dump_json(), headers=self.headers, ) - results = self.response_recognise(responses.status_code) + results = self.response_recognise(response.status_code) return results # Get vector stores in specific workspaces @@ -203,23 +203,23 @@ def get_raster_stores_in_workspaces(self, workspace: str) -> CoveragesStoresMode def get_vector_store(self, workspace: str, store: str) -> DataStoreModel: url = f"workspaces/{workspace}/datastores/{store}.json" Client = self.http_client - responses = Client.get(url) - if responses.status_code == 200: - return DataStoreModel.model_validate(responses.json()) + response = Client.get(url) + if response.status_code == 200: + return DataStoreModel.model_validate(response.json()) else: - results = self.response_recognise(responses.status_code) + results = self.response_recognise(response.status_code) return results # create vector store in specific workspaces @exception_handler def create_vector_store(self, workspace: str, store: DataStoresModel) -> GSResponse: Client = self.http_client - responses = Client.post( + response = Client.post( f"workspaces/{workspace}/datastores", content=store.model_dump_json(), headers=self.headers, ) - results = self.response_recognise(responses.status_code) + results = self.response_recognise(response.status_code) return results # Get raster store information in specific workspaces @@ -227,11 +227,11 @@ def create_vector_store(self, workspace: str, store: DataStoresModel) -> GSRespo def get_raster_store(self, workspace: str, store: str) -> CoveragesStoreModel: url = f"workspaces/{workspace}/coveragestores/{store}.json" Client = self.http_client - responses = Client.get(url) - if responses.status_code == 200: - return CoveragesStoreModel.model_validate(responses.json()) + response = Client.get(url) + if response.status_code == 200: + return CoveragesStoreModel.model_validate(response.json()) else: - results = self.response_recognise(responses.status_code) + results = self.response_recognise(response.status_code) return results # Get raster store information in specific workspaces @@ -240,12 +240,12 @@ def create_raster_store( self, workspace: str, store: CoveragesStoreModel ) -> GSResponse: Client = self.http_client - responses = Client.post( + response = Client.post( f"workspaces/{workspace}/coveragestores", content=store.model_dump_json(), headers=self.headers, ) - results = self.response_recognise(responses.status_code) + results = self.response_recognise(response.status_code) return results # delete store in specific workspaces @@ -255,14 +255,14 @@ def delete_store( ) -> GSResponse: # TODO : add enum for type Client = self.http_client if type == "raster": - responses = Client.delete( + response = Client.delete( f"/workspaces/{workspace}/coveragestores/{store}", headers=self.headers ) elif type == "vector": - responses = Client.delete( + response = Client.delete( f"/workspaces/{workspace}/datastores/{store}", headers=self.headers ) - results = self.response_recognise(responses.status_code) + results = self.response_recognise(response.status_code) return results # Get all styles in GS @@ -280,11 +280,11 @@ def get_all_styles(self) -> AllStylesModel: @exception_handler def get_style(self, style: str) -> StyleModel: Client = self.http_client - responses = Client.get(f"styles/{style}.json") - if responses.status_code == 200: - return StyleModel.model_validate(responses.json()) + response = Client.get(f"styles/{style}.json") + if response.status_code == 200: + return StyleModel.model_validate(response.json()) else: - results = self.response_recognise(responses.status_code) + results = self.response_recognise(response.status_code) return results @exception_handler @@ -303,8 +303,8 @@ def create_file_store( ) else: raise ValueError(f"Service type {service_type} not supported") - responses = service.addFile(self.http_client, workspace, store) - return self.response_recognise(responses) + response = service.addFile(self.http_client, workspace, store) + return self.response_recognise(response) # Create workspace @exception_handler @@ -332,12 +332,12 @@ def create_pg_store( ) ) Client = self.http_client - responses = Client.post( + response = Client.post( f"workspaces/{workspace}/datastores/", data=payload.model_dump_json(), headers=self.headers, ) - results = self.response_recognise(responses.status_code) + results = self.response_recognise(response.status_code) return results # Get all layers @@ -361,17 +361,17 @@ def get_vector_layer( self, workspace: str, store: str, layer: str ) -> Union[FeatureTypesModel, GSResponse]: Client = self.http_client - responses = Client.get( + response = Client.get( f"/workspaces/{workspace}/datastores/{store}/featuretypes/{layer}.json" ) - if responses.status_code == 200: + if response.status_code == 200: try: - return FeatureTypesModel.parse_obj(responses.json()) + return FeatureTypesModel.parse_obj(response.json()) except ValidationError as validation_error: print("Pydantic Validation Error:") print(validation_error) else: - results = self.response_recognise(responses.status_code) + results = self.response_recognise(response.status_code) return results @exception_handler @@ -379,13 +379,13 @@ def get_raster_layer( self, workspace: str, store: str, layer: str ) -> Union[CoverageModel, GSResponse]: Client = self.http_client - responses = Client.get( + response = Client.get( f"/workspaces/{workspace}/coveragestores/{store}/coverages/{layer}.json" ) - if responses.status_code == 200: - return CoverageModel.parse_obj(responses.json()) + if response.status_code == 200: + return CoverageModel.parse_obj(response.json()) else: - results = self.response_recognise(responses.status_code) + results = self.response_recognise(response.status_code) return results # Get specific layer @@ -394,10 +394,10 @@ def get_layer( self, workspace: str, layer: str, detail: bool = False ) -> Union[LayerModel, FeatureTypesModel, GSResponse]: Client = self.http_client - responses = Client.get(f"layers/{workspace}:{layer}") - if responses.status_code == 200: + response = Client.get(f"layers/{workspace}:{layer}") + if response.status_code == 200: if detail: - res = responses.json() + res = response.json() if res["layer"]["type"] == "VECTOR": result = self.get_vector_layer( workspace, @@ -411,9 +411,9 @@ def get_layer( ) return CoverageModel.parse_obj(result.dict()) else: - return LayerModel.parse_obj(responses.json()) + return LayerModel.parse_obj(response.json()) else: - results = self.response_recognise(responses.status_code) + results = self.response_recognise(response.status_code) return results @exception_handler @@ -421,31 +421,31 @@ def create_vector_layer( self, workspace: str, layer: FeatureTypesModel ) -> GSResponse: Client = self.http_client - responses = Client.post( + response = Client.post( f"/workspaces/{workspace}/featuretypes", data=layer.model_dump(by_alias=True, exclude_none=True), headers=self.headers, ) - results = self.response_recognise(responses.status_code) + results = self.response_recognise(response.status_code) return results @exception_handler def create_raster_layer(self, workspace: str, layer: CoverageModel) -> GSResponse: Client = self.http_client - responses = Client.post( + response = Client.post( f"/workspaces/{workspace}/coverages", data=layer.model_dump_json(), headers=self.headers, ) - results = self.response_recognise(responses.status_code) + results = self.response_recognise(response.status_code) return results # Delete specific layer @exception_handler def delete_layer(self, workspace: str, layer: str) -> GSResponse: Client = self.http_client - responses = Client.delete(f"layers/{workspace}:{layer}") - results = self.response_recognise(responses.status_code) + response = Client.delete(f"layers/{workspace}:{layer}") + results = self.response_recognise(response.status_code) return results # Get all layer groups @@ -492,13 +492,13 @@ def get_geofence_rule(self, id: int) -> Union[GetRule, GSResponse]: # If the module check fails, return the GSResponse directly if isinstance(module_check, GSResponse): return module_check - responses = Client.get( + response = Client.get( f"geofence/rules/id/{id}", headers={"Accept": "application/json"} ) - if responses.status_code == 200: - return Rule.model_validate(responses.json()) + if response.status_code == 200: + return Rule.model_validate(response.json()) else: - results = self.response_recognise(responses.status_code) + results = self.response_recognise(response.status_code) return results # Create geofence on geoserver @@ -511,10 +511,10 @@ def create_geofence(self, rule: Rule) -> GSResponse: if isinstance(module_check, GSResponse): return module_check Client = self.http_client - responses = Client.post( + response = Client.post( "geofence/rules", content=PostingRule.model_dump_json(), headers=self.headers, ) - results = self.response_recognise(responses.status_code) + results = self.response_recognise(response.status_code) return results