dnastack-client-library 3.1.160__py3-none-any.whl → 3.1.168__py3-none-any.whl

dnastack/cli/commands/explorer/questions/commands.py

@@ -152,6 +152,8 @@ def init_questions_commands(group: Group):
             if invalid_ids:
                 click.echo(f"Error: Invalid collection IDs for this question: {', '.join(invalid_ids)}", err=True)
                 raise click.Abort()
+        else:
+            collection_ids = [col.id for col in question.collections]
         
         # Execute the question
         results_iter = client.ask_federated_question(

dnastack/client/explorer/client.py

@@ -91,11 +91,9 @@ class ExplorerClient(BaseServiceClient):
                         f"Not authorized to access question '{question_id}'"
                     )
                 elif status_code == 404:
-                    raise ClientError(f"Question '{question_id}' not found")
+                    raise ClientError(e.response, e.trace, f"Question '{question_id}' not found")
                 else:
-                    raise ClientError(
-                        f"Failed to retrieve question '{question_id}': {e.response.text}"
-                    )
+                    raise ClientError(e.response, e.trace, f"Failed to retrieve question '{question_id}'")
 
     def ask_federated_question(
         self,
@@ -179,9 +177,8 @@ class FederatedQuestionListResultLoader(ResultLoader):
                         "Not authorized to list federated questions"
                     )
                 else:
-                    raise ClientError(
-                        f"Failed to load federated questions: {e.response.text}"
-                    )
+                    
+                    raise ClientError(e.response, e.trace, "Failed to load federated questions")
 
 
 class FederatedQuestionQueryResultLoader(ResultLoader):
@@ -247,10 +244,8 @@ class FederatedQuestionQueryResultLoader(ResultLoader):
                         "Not authorized to ask federated questions"
                     )
                 elif status_code == 400:
-                    raise ClientError(
-                        f"Invalid question parameters: {e.response.text}"
-                    )
+                    
+                    raise ClientError(e.response, e.trace, "Invalid question parameters")
                 else:
-                    raise ClientError(
-                        f"Failed to execute federated question: {e.response.text}"
-                    )
+                    
+                    raise ClientError(e.response, e.trace, "Failed to execute federated question")

dnastack/constants.py

@@ -1,5 +1,5 @@
 import os
 
-__version__ = "v3.1.160"
+__version__ = "v3.1.168"
 
 LOCAL_STORAGE_DIRECTORY = os.path.join(os.path.expanduser("~"), '.dnastack')

dnastack/http/session.py

@@ -23,8 +23,8 @@ class AuthenticationError(RuntimeError):
 
 
 class HttpError(RuntimeError):
-    def __init__(self, response: Response, trace_context: Optional[Span] = None):
-        super(HttpError, self).__init__(response, trace_context)
+    def __init__(self, response: Response, trace_context: Optional[Span] = None, message: Optional[str] = None):
+        super(HttpError, self).__init__(response, trace_context, message)
 
     @property
     def response(self) -> Response:
@@ -33,19 +33,26 @@ class HttpError(RuntimeError):
     @property
     def trace(self) -> Span:
         return self.args[1]
+    
+    @property
+    def message(self) -> Optional[str]:
+        return self.args[2] if len(self.args) > 2 else None
 
     def __str__(self):
         response: Response = self.response
 
         error_feedback = f'HTTP {response.status_code}'
 
-        # Prepare the error feedback.
         response_text = response.text.strip()
         if len(response_text) == 0:
             error_feedback = f'{error_feedback} (empty response)'
         else:
             error_feedback = f'{error_feedback}: {response_text}'
 
+        custom_message = self.message
+        if custom_message:
+            error_feedback = f'{custom_message} - {error_feedback}'
+
         trace: Span = self.trace
         if trace:
             error_feedback = f'[{trace.trace_id},{trace.span_id}] {error_feedback}'
@@ -68,6 +75,7 @@ class JsonPatch(BaseModel):
 
 
 class RetryHistoryEntry(BaseModel):
+    url: str
     authenticator_index: int
     with_reauthentication: bool
     with_next_authenticator: bool
@@ -153,7 +161,7 @@ class HttpSession(AbstractContextManager):
                authenticator_index: int = 0,
                retry_history: Optional[List[RetryHistoryEntry]] = None,
                trace_context: Optional[Span] = None,
-               **kwargs) -> Response:
+               **kwargs) -> Response | None | Any:
         trace_context = trace_context or Span(origin=self)
 
         retry_history = retry_history or list()
@@ -317,7 +325,8 @@ class HttpSession(AbstractContextManager):
     def _raise_http_error(self,
                           response: Response,
                           authenticator: Authenticator,
-                          trace_context: Span):
+                          trace_context: Span,
+                          message: Optional[str] = None):
         trace_logger = trace_context.create_span_logger(self.__logger) if trace_context else self.__logger
 
         if isinstance(authenticator, OAuth2Authenticator):
@@ -344,7 +353,7 @@ class HttpSession(AbstractContextManager):
         else:
             trace_logger.error('The authenticator is not available or supported for extracting additional info.')
 
-        raise (ClientError if response.status_code < 500 else ServerError)(response, trace_context=trace_context)
+        raise (ClientError if response.status_code < 500 else ServerError)(response, trace_context=trace_context, message=message)
 
     def __del__(self):
         self.close()

{dnastack_client_library-3.1.160.dist-info → dnastack_client_library-3.1.168.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dnastack-client-library
-Version: 3.1.160
+Version: 3.1.168
 Summary: DNAstack's GA4GH library and CLI
 Author-email: DNAstack <devs@dnastack.com>
 License: Apache License, Version 2.0

{dnastack_client_library-3.1.160.dist-info → dnastack_client_library-3.1.168.dist-info}/RECORD

@@ -1,6 +1,6 @@
 dnastack/__init__.py,sha256=mslf7se8vBSK_HkqWTGPdibeVhT4xyKXgzQBV7dEK1M,333
 dnastack/__main__.py,sha256=EKmtIs4TBseQJi-OT_U6LqRyKLiyrGTBuTQg9zE-G2I,4376
-dnastack/constants.py,sha256=gddQdVRGL-wmdJ9LGIac_q3bwrCV5rzW-isACUNjOJI,114
+dnastack/constants.py,sha256=uuuxY_BJ60LgFuqhtfDC10aGSLwSJkTa4X8j8IyE1Zg,114
 dnastack/feature_flags.py,sha256=RK_V_Ovncoe6NeTheAA_frP-kYkZC1fDlTbbup2KYG4,1419
 dnastack/json_path.py,sha256=TyghhDf7nGQmnsUWBhenU_fKsE_Ez-HLVER6HgH5-hU,2700
 dnastack/omics_cli.py,sha256=ZppKZTHv_XjUUZyRIzSkx0Ug5ODAYrCOTsU0ezCOVrA,3694
@@ -52,7 +52,7 @@ dnastack/cli/commands/drs/utils.py,sha256=tGogaIlXKnk03GqitzeDfo893JlP7Nc_X28sH-
 dnastack/cli/commands/explorer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dnastack/cli/commands/explorer/commands.py,sha256=X1gvnH3TPoE4BIVBBVA2BMRQpA4qT3XhcjxsfRftMoI,589
 dnastack/cli/commands/explorer/questions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dnastack/cli/commands/explorer/questions/commands.py,sha256=37-BnAxCh0dEPe5BpBh06esMdtfoF73xL5zhQ2aLK5w,6129
+dnastack/cli/commands/explorer/questions/commands.py,sha256=iV25gL9kLADjsBmQkUHRnYp-U5bIJuYDUIjfsGpT0FQ,6213
 dnastack/cli/commands/explorer/questions/tables.py,sha256=cb8YKqY7Qxrm2ROz7z8H6bGp964BNEipuX8KaThTveo,4337
 dnastack/cli/commands/explorer/questions/utils.py,sha256=HNBHEV_F-41IyfnG1ZfxMnacp11UvhwnH4Z2DKgxPZs,7634
 dnastack/cli/commands/publisher/__init__.py,sha256=G8WNdx1UwanoA4X349ghv8Zyv5YizB8ryeJmwu9px8o,443
@@ -125,7 +125,7 @@ dnastack/client/datasources/__init__.py,sha256=HxDIHuQX8KMWr3o70ucL3x79pXKaIHbBq
 dnastack/client/datasources/client.py,sha256=jfVzCSKuQJsggbvfJVbftYJ0hd6gAPsBZMgvINOgjRE,4671
 dnastack/client/datasources/model.py,sha256=dV9Sf05ivIq0ubwIIYK3kSv1xJ_TtjxvVp_ddI9aHEk,214
 dnastack/client/explorer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dnastack/client/explorer/client.py,sha256=A_C2YN5rLc-KqOBxmYHvLcq1tbRrRwRdfmV8DwcQAuQ,9511
+dnastack/client/explorer/client.py,sha256=_YisPn9jQUSk-O-8E9Vncn_jALLRvu7etYC-1KK3vKY,9416
 dnastack/client/explorer/models.py,sha256=vrltbcb4qAx6z1oGXG8ufw2kZ36dDiwU5QGqOomYp6c,3126
 dnastack/client/service_registry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dnastack/client/service_registry/client.py,sha256=r7D8CnPJLbNkc03g2PYHt880Ba1oPW2d8B0ShP0p4Eo,1131
@@ -179,7 +179,7 @@ dnastack/context/manager.py,sha256=4Z_KhDhIClkUOiT605yi9SwehdqiJwYth4T3G3Lb4rM,1
 dnastack/context/models.py,sha256=BXSJZSwiopNZ_l2nY8uzofoYebLYwu0BLbirSBIY110,671
 dnastack/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dnastack/http/client_factory.py,sha256=HdRZpTEnFQcHEdVbdYl7AbCcRUv3K3kVyznIxEWIqvA,650
-dnastack/http/session.py,sha256=R-rsE_TTswlTTlqJW7a6_O-sVMmbrnEMnKBf7m_5I8U,15058
+dnastack/http/session.py,sha256=LAVJW6RzURnHf0lpl3GYQjAzPb9QB9PESOyB7nKesTw,15413
 dnastack/http/session_info.py,sha256=I0m8Z17MCtsWgMCmlzhtOzsXZfUddBAXp0XSOLWfgrM,9366
 dnastack/http/authenticators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dnastack/http/authenticators/abstract.py,sha256=b5zXqSdCasiy6Bz5LYTr7e_p7l4__Mq5shgTV6bBGnk,9241
@@ -194,9 +194,9 @@ dnastack/http/authenticators/oauth2_adapter/device_code_flow.py,sha256=dXI5CyUcs
 dnastack/http/authenticators/oauth2_adapter/factory.py,sha256=ZtNXOklWEim-26ooNoPp3ji_hRg1vf4fHHnY94F0wLI,1087
 dnastack/http/authenticators/oauth2_adapter/models.py,sha256=iY7asrSElyjubInrGV5rJKKZAxJWeq7csnaj-EqMq00,943
 dnastack/http/authenticators/oauth2_adapter/token_exchange.py,sha256=nSuAsSKWa_UNqHSbPMOEk4komaFITYAnE04Sk5WOrLc,6332
-dnastack_client_library-3.1.160.dist-info/licenses/LICENSE,sha256=uwybO-wUbQhxkosgjhJlxmYATMy-AzoULFO9FUedE34,11580
-dnastack_client_library-3.1.160.dist-info/METADATA,sha256=MhN44vdROVWBseHG309SvqkHlvKcnT3AEigPkn2iImk,1766
-dnastack_client_library-3.1.160.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dnastack_client_library-3.1.160.dist-info/entry_points.txt,sha256=Y6OeicsiyGn3-8D-SiV4NiKlJgXfkSqK88kFBR6R1rY,89
-dnastack_client_library-3.1.160.dist-info/top_level.txt,sha256=P2RgRyqJ7hfNy1wLVRoVLJYEppUVkCX3syGK9zBqkt8,9
-dnastack_client_library-3.1.160.dist-info/RECORD,,
+dnastack_client_library-3.1.168.dist-info/licenses/LICENSE,sha256=uwybO-wUbQhxkosgjhJlxmYATMy-AzoULFO9FUedE34,11580
+dnastack_client_library-3.1.168.dist-info/METADATA,sha256=q6nHnGlEfbHDHArIU0ZQ7VofZcaq_7rVDM9ZBW8q-JQ,1766
+dnastack_client_library-3.1.168.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dnastack_client_library-3.1.168.dist-info/entry_points.txt,sha256=Y6OeicsiyGn3-8D-SiV4NiKlJgXfkSqK88kFBR6R1rY,89
+dnastack_client_library-3.1.168.dist-info/top_level.txt,sha256=P2RgRyqJ7hfNy1wLVRoVLJYEppUVkCX3syGK9zBqkt8,9
+dnastack_client_library-3.1.168.dist-info/RECORD,,