das-cli 1.3.5__tar.gz → 1.3.9__tar.gz

{das_cli-1.3.5/das_cli.egg-info → das_cli-1.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: das-cli
-Version: 1.3.5
+Version: 1.3.9
 Summary: DAS api client.
 Author: Royal Netherlands Institute for Sea Research
 License-Expression: MIT

{das_cli-1.3.5 → das_cli-1.3.9}/das/common/config.py

@@ -65,6 +65,8 @@ def save_verify_ssl(verify: bool) -> None:
         except Exception:
             config = {}
     config["verify_ssl"] = verify
+    # Explicit CLI setting should take precedence over environment defaults.
+    config["verify_ssl_explicit"] = True
     VERIFY_SSL = verify
     CONFIG_FILE.write_text(json.dumps(config), encoding="utf-8")
 
@@ -79,21 +81,29 @@ def load_verify_ssl() -> bool:
     if CONFIG_FILE.exists():
         try:
             config = json.loads(CONFIG_FILE.read_text(encoding="utf-8"))
-            
-            if os.getenv("VERIFY_SSL") is not None:
-                VERIFY_SSL = os.getenv("VERIFY_SSL") == "True"
+
+            verify = config.get("verify_ssl")
+            verify_explicit = config.get("verify_ssl_explicit", False)
+            if verify is not None and verify_explicit:
+                VERIFY_SSL = verify
+                if not VERIFY_SSL:
+                    print("SSL certificate verification is disabled")
+                return verify
+
+            env_verify_ssl = os.getenv("VERIFY_SSL")
+            if env_verify_ssl is not None:
+                VERIFY_SSL = env_verify_ssl.strip().lower() == "true"
                 if not VERIFY_SSL:
                     print("SSL certificate verification is disabled")
                 return VERIFY_SSL
 
-            verify = config.get("verify_ssl")
             if verify is not None:
                 VERIFY_SSL = verify
                 if not VERIFY_SSL:
                     print("SSL certificate verification is disabled")
                 return verify
-            else:
-                raise ValueError("SSL certificate verification is not set")
+
+            raise ValueError("SSL certificate verification is not set")
         except Exception:
             pass
     return VERIFY_SSL

{das_cli-1.3.5 → das_cli-1.3.9}/das/managers/search_manager.py

@@ -52,7 +52,7 @@ class SearchManager:
             raise ValueError(f"Sorting field '{sort_by}' not found in entry fields.")
         return f"{field.get('column')} {sort_order}"
 
-    def search_entries(self, attribute: str, query: str, max_results: int = 10, page: int = 1, sort_by: str = "Name", sort_order: str = "asc"):
+    def search_entries(self, attribute: str, query: str, max_results: int = 10, page: int = 1, sort_by: str = "Name", sort_order: str = "asc", includeRelationsId: bool = False):
         """Search entries based on provided criteria."""
         try:
             # Validate attribute
@@ -77,7 +77,8 @@ class SearchManager:
                 "queryString": self.__convert_filter(entry_fields, query),
                 "maxResultCount": max_results,
                 "skipCount": 0 if page <= 0 else (max_results * (page - 1)),
-                "sorting": self.__convert_sorting(entry_fields, sort_by, sort_order)
+                "sorting": self.__convert_sorting(entry_fields, sort_by, sort_order),
+                "includeRelationsId": includeRelationsId
             }
             results = self.search_service.search_entries(**search_params)
 

{das_cli-1.3.5 → das_cli-1.3.9/das_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: das-cli
-Version: 1.3.5
+Version: 1.3.9
 Summary: DAS api client.
 Author: Royal Netherlands Institute for Sea Research
 License-Expression: MIT

{das_cli-1.3.5 → das_cli-1.3.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "das-cli"
-version = "1.3.05"
+version = "1.3.09"
 authors = [
   { name="Royal Netherlands Institute for Sea Research" },
 ]