das-cli 1.0.1__py3-none-any.whl → 1.0.4__py3-none-any.whl

das/common/api.py

@@ -1,6 +1,6 @@
 import json
 import requests
-from das.common.config import VERIFY_SSL
+from das.common.config import load_verify_ssl
 
 
 def get_data(url, headers=None, params=None):
@@ -16,7 +16,7 @@ def get_data(url, headers=None, params=None):
         dict: The JSON response from the API or an error message.
     """
     try:
-        response = requests.get(url, headers=headers, params=params, verify=VERIFY_SSL)
+        response = requests.get(url, headers=headers, params=params, verify=load_verify_ssl())
         response.raise_for_status()  # Raise an error for HTTP errors
         try:
             return response.json()
@@ -40,7 +40,7 @@ def post_data(url, headers=None, data=None):
         dict: The JSON response from the API or an error message.
     """
     try:
-        response = requests.post(url, headers=headers, json=data, verify=VERIFY_SSL)
+        response = requests.post(url, headers=headers, json=data, verify=load_verify_ssl())
         response.raise_for_status()  # Raise an error for HTTP errors
         try:
             return response.json()
@@ -64,7 +64,7 @@ def put_data(url, headers=None, data=None):
         dict: The JSON response from the API or an error message.
     """
     try:
-        response = requests.put(url, headers=headers, json=data, verify=VERIFY_SSL)
+        response = requests.put(url, headers=headers, json=data, verify=load_verify_ssl())
         response.raise_for_status()  # Raise an error for HTTP errors
         try:
             return response.json()
@@ -88,7 +88,7 @@ def delete_data(url, headers=None, data=None):
         dict: The JSON response from the API or an error message.
     """
     try:
-        response = requests.delete(url, headers=headers, json=data, verify=VERIFY_SSL)
+        response = requests.delete(url, headers=headers, json=data, verify=load_verify_ssl())
         response.raise_for_status()  # Raise an error for HTTP errors
         try:
             return response.json()

das/managers/search_manager.py

@@ -55,7 +55,7 @@ class SearchManager:
                 "attributeId": attribute_id,
                 "queryString": self.__convert_filter(entry_fields, query),
                 "maxResultCount": max_results,
-                "skipCount": (max_results * (page - 1)),
+                "skipCount": 0 if page <= 0 else (max_results * (page - 1)),
                 "sorting": self.__convert_sorting(entry_fields, sort_by, sort_order)
             }
             results = self.search_service.search_entries(**search_params)

das/services/downloads.py

@@ -1,84 +1,84 @@
-from das.common.api import post_data, get_data
-from das.common.config import load_token
-
-
-class DownloadRequestService:
-    def __init__(self, base_url):
-        self.base_url = f"{base_url}/api/services/app/DownloadRequest"
-
-    def create(self, request_data: list[dict]):
-        """Create a new download request."""
-        token = load_token()
-
-        if (token is None or token == ""):
-            raise ValueError("Authorization token is required")
-
-        headers = {
-            "Authorization": f"Bearer {token}",
-            "Content-Type": "application/json"
-        }
-
-        url = f"{self.base_url}/Create"
-
-        response = post_data(url, data=request_data, headers=headers)
-
-        if response.get('success') == True:
-            return response.get('result')
-        else:
-            raise ValueError(response.get('error'))        
-        
-    def delete(self, request_id: str):
-        """Delete a download request by ID."""
-
-        #check if request_id is valid uuid
-        if not isinstance(request_id, str) or len(request_id) != 36:
-            raise ValueError("Invalid request ID")
-
-        token = load_token()
-
-        if (token is None or token == ""):
-            raise ValueError("Authorization token is required")
-
-        headers = {
-            "Authorization": f"Bearer {token}",
-            "Content-Type": "application/json"
-        }
-
-        url = f"{self.base_url}/Delete?downloadRequestId={request_id}"
-
-        response = post_data(url, data={}, headers=headers)
-
-        if response.get('success') == True:
-            return response.get('result')
-        else:
-            raise ValueError(response.get('error'))
-
-    def get_my_requests(self):
-        """Get all download requests for the current user."""
-        token = load_token()
-
-        if (token is None or token == ""):
-            raise ValueError("Authorization token is required")
-
-        headers = {
-            "Authorization": f"Bearer {token}"
-        }
-        
-        url = f"{self.base_url}/GetMyRequests"
-        response = get_data(url, headers=headers)
-
-        # Expected API response shape:
-        # { success: true, result: { totalCount: number, items: [...] }, ... }
-        if isinstance(response, dict) and response.get('success') is True:
-            return response.get('result')
-        # Some backends might already return the result without 'success'
-        if isinstance(response, dict) and 'result' in response and 'success' not in response:
-            return response.get('result')
-        # If the API directly returns the payload (result), pass it through
-        if isinstance(response, dict) and 'items' in response and 'totalCount' in response:
-            return response
-        # Otherwise raise a meaningful error
-        error_msg = None
-        if isinstance(response, dict):
-            error_msg = response.get('error') or response.get('message')
+from das.common.api import post_data, get_data
+from das.common.config import load_token
+
+
+class DownloadRequestService:
+    def __init__(self, base_url):
+        self.base_url = f"{base_url}/api/services/app/DownloadRequest"
+
+    def create(self, request_data: list[dict]):
+        """Create a new download request."""
+        token = load_token()
+
+        if (token is None or token == ""):
+            raise ValueError("Authorization token is required")
+
+        headers = {
+            "Authorization": f"Bearer {token}",
+            "Content-Type": "application/json"
+        }
+
+        url = f"{self.base_url}/Create"
+
+        response = post_data(url, data=request_data, headers=headers)
+
+        if response.get('success') == True:
+            return response.get('result')
+        else:
+            raise ValueError(response.get('error'))        
+        
+    def delete(self, request_id: str):
+        """Delete a download request by ID."""
+
+        #check if request_id is valid uuid
+        if not isinstance(request_id, str) or len(request_id) != 36:
+            raise ValueError("Invalid request ID")
+
+        token = load_token()
+
+        if (token is None or token == ""):
+            raise ValueError("Authorization token is required")
+
+        headers = {
+            "Authorization": f"Bearer {token}",
+            "Content-Type": "application/json"
+        }
+
+        url = f"{self.base_url}/Delete?downloadRequestId={request_id}"
+
+        response = post_data(url, data={}, headers=headers)
+
+        if response.get('success') == True:
+            return response.get('result')
+        else:
+            raise ValueError(response.get('error'))
+
+    def get_my_requests(self):
+        """Get all download requests for the current user."""
+        token = load_token()
+
+        if (token is None or token == ""):
+            raise ValueError("Authorization token is required")
+
+        headers = {
+            "Authorization": f"Bearer {token}"
+        }
+        
+        url = f"{self.base_url}/GetMyRequests"
+        response = get_data(url, headers=headers)
+
+        # Expected API response shape:
+        # { success: true, result: { totalCount: number, items: [...] }, ... }
+        if isinstance(response, dict) and response.get('success') is True:
+            return response.get('result')
+        # Some backends might already return the result without 'success'
+        if isinstance(response, dict) and 'result' in response and 'success' not in response:
+            return response.get('result')
+        # If the API directly returns the payload (result), pass it through
+        if isinstance(response, dict) and 'items' in response and 'totalCount' in response:
+            return response
+        # Otherwise raise a meaningful error
+        error_msg = None
+        if isinstance(response, dict):
+            error_msg = response.get('error') or response.get('message')
         raise ValueError(error_msg or 'Failed to fetch download requests')

{das_cli-1.0.1.dist-info → das_cli-1.0.4.dist-info}/METADATA

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

{das_cli-1.0.1.dist-info → das_cli-1.0.4.dist-info}/RECORD

@@ -1,11 +1,11 @@
 das/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 das/app.py,sha256=kKxN4Vn84SA5Ph3zY13avMG2vrUp-ffpdDkhwYR9Bho,1475
-das/cli.py,sha256=-ldC81HpBtcoBf9b46dieanDr41sBwoGEWLGvbiMvnI,43658
+das/cli.py,sha256=G1i6S8AF4Bx3ZSb7ba42h7NTxKxpsydrk7IIz26QJpk,45116
 das/ai/plugins/dasai.py,sha256=R0X0Vey_GOAtWoqcloB-NATZFtXB_l5b9dfPXocNIbI,2165
 das/ai/plugins/entries/entries_plugin.py,sha256=Dhv6PrguQj5mzxBW6DlCzkmwucszazLQfzwlp9EhIGk,608
 das/authentication/auth.py,sha256=DTtH66Ft6nuuMe7EYvrr3GqGVEGGxE7GmD2fO7vRv4s,1501
 das/authentication/secure_input.py,sha256=P-NpbFeHrp2uIOMqip55cGn_NqqpswhnknAF1t7c2_U,1911
-das/common/api.py,sha256=rtKG8GF3-lNTvmu1DAzJm7hiu0Ltl_5AjMInwEDE2gg,3872
+das/common/api.py,sha256=9kuM8Gcw29uiYbqw9fPK4w5gTpWv9baxjK9NvHNeb5E,3905
 das/common/config.py,sha256=nkWN4-4xUEo6DPlTkaAnHQF_HGwulm73D4U2DyWvibU,5600
 das/common/entry_fields_constants.py,sha256=5Yh4Ujt70HEF-FsnwVBPBm3DB3HHzQWSWR-9Upt7C5I,93
 das/common/enums.py,sha256=jS0frv6717duG_wZNockXMTZ-VfsGu_f8_-lgYGnrcY,1745
@@ -13,18 +13,18 @@ das/common/file_utils.py,sha256=-zePjYsj8iRpQssVQMHDK3Mh5q8FooKJCUCKCXKS6_Y,7006
 das/managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 das/managers/download_manager.py,sha256=NqaLhmjw-4nZq8SVdN0g5MAnbMPEnu-A3A4oXxQ-IZQ,3776
 das/managers/entries_manager.py,sha256=Kc_PN71Bp7VICrxoP9MiDCrUzR7OdUXfX5puDDxtm08,19015
-das/managers/search_manager.py,sha256=ba3fYiLEdkgeOmPr0j5XRMq29DrQTsrPRGDMJCznvHk,3485
+das/managers/search_manager.py,sha256=6nRHSc2YosVj5NBoFp2uM09FZiMMVfchoXT8Q-b5oNY,3505
 das/services/attributes.py,sha256=78E9f1wNZYxG9Hg5HfX_h1CFmACaMjwD2Y6Ilb7PJGY,2616
 das/services/cache.py,sha256=g-vY51gqGV_1Vpza476PkMqGpuDNo1NbTwQWIIsvO0s,1932
-das/services/downloads.py,sha256=LDjPaYDQf0-XmMtC_FjDhHLsPBw1_vfUMwSfRMycyqA,2977
+das/services/downloads.py,sha256=YBDFPmjAQHUK0OUdFprW1Ox81nzpKaJE9xQBJyyEz4Q,3060
 das/services/entries.py,sha256=Uspl7LZcNWEnr7ct5_Kn31jMjrkSKV7UXzrN6nb3HF0,4966
 das/services/entry_fields.py,sha256=x2wUDkKNduj9pf4s56hRo0UW-eBhipkU9gFMEjFw5DA,1290
 das/services/hangfire.py,sha256=hidmVP9yb4znzBaJJRyKawYx7oYaBv5OVL-t0BhvN_A,818
 das/services/search.py,sha256=3X_KPb9fs024FhxoTr4j-xY5ymm5rvvzlekxuh8tLdg,1374
 das/services/users.py,sha256=iNijO2UPIEtcpPy8Tkemdxxym9rYLCUyckQHIQj68W0,795
-das_cli-1.0.1.dist-info/licenses/LICENSE,sha256=4EDhysVgQWBlzo0rdUl_k89s-iVfgCcSa1gUx1TM1vA,1124
-das_cli-1.0.1.dist-info/METADATA,sha256=fFKNTKwBC53hk0MQLFpO1nU2wpg4FDT_16Wktgl0Sjc,10469
-das_cli-1.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-das_cli-1.0.1.dist-info/entry_points.txt,sha256=ZrdMae7NcvogQhzM1zun8E8n_QwYq-LpZvoJCr2_I4g,36
-das_cli-1.0.1.dist-info/top_level.txt,sha256=OJsPEeJyJ2rJlpEn2DTPgbMSvYG-6FeD13_m5qLpw3E,4
-das_cli-1.0.1.dist-info/RECORD,,
+das_cli-1.0.4.dist-info/licenses/LICENSE,sha256=4EDhysVgQWBlzo0rdUl_k89s-iVfgCcSa1gUx1TM1vA,1124
+das_cli-1.0.4.dist-info/METADATA,sha256=aOev384umltx9O1PaLA-xAx6IRZhERf7fv3t727LRZI,10469
+das_cli-1.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+das_cli-1.0.4.dist-info/entry_points.txt,sha256=ZrdMae7NcvogQhzM1zun8E8n_QwYq-LpZvoJCr2_I4g,36
+das_cli-1.0.4.dist-info/top_level.txt,sha256=OJsPEeJyJ2rJlpEn2DTPgbMSvYG-6FeD13_m5qLpw3E,4
+das_cli-1.0.4.dist-info/RECORD,,