geoservercloud 0.3.0.dev2__tar.gz → 0.3.0.dev3__tar.gz

{geoservercloud-0.3.0.dev2 → geoservercloud-0.3.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geoservercloud
-Version: 0.3.0.dev2
+Version: 0.3.0.dev3
 Summary: Lightweight Python client to interact with GeoServer Cloud REST API, GeoServer ACL and OGC services
 License: BSD-2-Clause
 Author: Camptocamp
@@ -14,6 +14,8 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: OWSLib
 Requires-Dist: requests
+Requires-Dist: types-requests
+Requires-Dist: types-xmltodict
 Requires-Dist: xmltodict
 Description-Content-Type: text/markdown
 

{geoservercloud-0.3.0.dev2 → geoservercloud-0.3.0.dev3}/geoservercloud/geoservercloud.py

@@ -18,7 +18,7 @@ class GeoServerCloud:
         self,
         url: str = "http://localhost:9090/geoserver/cloud/",
         user: str = "admin",
-        password: str = "geoserver",
+        password: str = "geoserver",  # nosec
     ) -> None:
 
         self.url: str = url
@@ -119,14 +119,14 @@ class GeoServerCloud:
 
     def set_default_locale_for_service(
         self, workspace: str, locale: str | None
-    ) -> None:
+    ) -> Response:
         path: str = self.workspace_wms_settings_path(workspace)
         data: dict[str, dict[str, Any]] = {
             "wms": {
                 "defaultLocale": locale,
             }
         }
-        self.put_request(path, json=data)
+        return self.put_request(path, json=data)
 
     def unset_default_locale_for_service(self, workspace) -> None:
         self.set_default_locale_for_service(workspace, None)
@@ -455,6 +455,7 @@ class GeoServerCloud:
                 **params,
                 timeout=120,
             )
+        return None
 
     def get_feature_info(
         self,
@@ -483,6 +484,7 @@ class GeoServerCloud:
             return self.wms.getfeatureinfo(
                 **params,
             )
+        return None
 
     def get_legend_graphic(
         self,
@@ -492,10 +494,11 @@ class GeoServerCloud:
         style: str | None = None,
         workspace: str | None = None,
     ) -> Response:
+        path: str
         if not workspace:
             path = "/wms"
         else:
-            path: str = f"/{workspace}/wms"
+            path = f"/{workspace}/wms"
         params: dict[str, Any] = {
             "service": "WMS",
             "version": "1.3.0",
@@ -524,12 +527,13 @@ class GeoServerCloud:
                 row=row,
                 column=column,
             )
+        return None
 
-    def create_role(self, role_name: str):
-        self.post_request(f"/rest/security/roles/role/{role_name}")
+    def create_role(self, role_name: str) -> Response:
+        return self.post_request(f"/rest/security/roles/role/{role_name}")
 
-    def delete_role(self, role_name: str):
-        self.delete_request(f"/rest/security/roles/role/{role_name}")
+    def delete_role(self, role_name: str) -> Response:
+        return self.delete_request(f"/rest/security/roles/role/{role_name}")
 
     def create_role_if_not_exists(self, role_name: str) -> Response | None:
         if self.role_exists(role_name):

{geoservercloud-0.3.0.dev2 → geoservercloud-0.3.0.dev3}/geoservercloud/restservice.py

@@ -2,6 +2,8 @@ from typing import Any
 
 import requests
 
+TIMEOUT = 120
+
 
 class RestService:
     def __init__(self, url: str, auth: tuple[str, str]) -> None:
@@ -19,6 +21,7 @@ class RestService:
             params=params,
             headers=headers,
             auth=self.auth,
+            timeout=TIMEOUT,
         )
         if response.status_code != 404:
             response.raise_for_status()
@@ -40,6 +43,7 @@ class RestService:
             json=json,
             data=data,
             auth=self.auth,
+            timeout=TIMEOUT,
         )
         if response.status_code != 409:
             response.raise_for_status()
@@ -60,6 +64,7 @@ class RestService:
             json=json,
             data=data,
             auth=self.auth,
+            timeout=TIMEOUT,
         )
         response.raise_for_status()
         return response
@@ -75,6 +80,7 @@ class RestService:
             params=params,
             headers=headers,
             auth=self.auth,
+            timeout=TIMEOUT,
         )
         if response.status_code != 404:
             response.raise_for_status()

{geoservercloud-0.3.0.dev2 → geoservercloud-0.3.0.dev3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "geoservercloud"
-version = "0.3.0.dev2"
+version = "0.3.0.dev3"
 description = "Lightweight Python client to interact with GeoServer Cloud REST API, GeoServer ACL and OGC services"
 authors = ["Camptocamp <info@camptocamp.com>"]
 license = "BSD-2-Clause"
@@ -12,6 +12,8 @@ python = ">=3.9,<4.0"
 requests = "2.32.3"
 OWSLib = "0.31.0"
 xmltodict = "0.13.0"
+types-requests = "2.32.0.20240907"
+types-xmltodict = "0.13.0.3"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "8.3.2"
@@ -43,3 +45,6 @@ fix-shallow-repository = true
 
 [tool.poetry-plugin-tweak-dependencies-version]
 default = "present"
+
+[tool.bandit]
+exclude_dirs = ["tests"]