quapp-common 0.0.14.dev2__tar.gz → 0.0.14.dev4__tar.gz

{quapp_common-0.0.14.dev2/quapp_common.egg-info → quapp_common-0.0.14.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quapp-common
-Version: 0.0.14.dev2
+Version: 0.0.14.dev4
 Summary: Quapp common library supporting Quapp Platform for Quantum Computing
 Author-email: "CITYNOW Co. Ltd. " <corp@citynow.vn>
 License: The MIT License (MIT)

{quapp_common-0.0.14.dev2 → quapp_common-0.0.14.dev4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "quapp-common"
-version = "0.0.14.dev2"
+version = "0.0.14.dev4"
 description = "Quapp common library supporting Quapp Platform for Quantum Computing"
 readme = "README.md"
 authors = [{ name = "CITYNOW Co. Ltd. ", email = "corp@citynow.vn" }]

{quapp_common-0.0.14.dev2 → quapp_common-0.0.14.dev4}/quapp_common/component/backend/invocation.py

@@ -97,8 +97,10 @@ class Invocation(ABC):
             job_response = build_error_job_response(exception,
                                                     message='Error when prepare backend data',
                                                     stage='while preparing the backend',
-                                                    phase=RuntimePhase.DEVICE_SELECTION)
-            job_response.authentication = self.authentication
+                                                    phase=RuntimePhase.DEVICE_SELECTION,
+                                                    authentication=self.authentication,
+                                                    project_header=self.project_header,
+                                                    workspace_header=self.workspace_header)
             update_job_metadata(job_response, self.callback_dict.get(
                     InvocationStep.PREPARATION).on_error)
 
@@ -142,7 +144,10 @@ class Invocation(ABC):
             job_response = build_error_job_response(exception,
                                                     message='Error when create provider or device',
                                                     stage='while running the circuit on the device',
-                                                    phase=RuntimePhase.PROVIDER_INVOCATION)
+                                                    phase=RuntimePhase.PROVIDER_INVOCATION,
+                                                    authentication=self.authentication,
+                                                    project_header=self.project_header,
+                                                    workspace_header=self.workspace_header)
             update_job_metadata(job_response, self.callback_dict.get(
                     InvocationStep.EXECUTION).on_error, )
 
@@ -194,7 +199,10 @@ class Invocation(ABC):
             job_response = build_error_job_response(exception, job_response,
                                                     message='Error when prepare circuit',
                                                     stage='while preparing the circuit',
-                                                    phase=RuntimePhase.PREPROCESSING)
+                                                    phase=RuntimePhase.PREPROCESSING,
+                                                    authentication=self.authentication,
+                                                    project_header=self.project_header,
+                                                    workspace_header=self.workspace_header)
 
             update_job_metadata(job_response, self.callback_dict.get(
                     InvocationStep.PREPARATION).on_error)

{quapp_common-0.0.14.dev2 → quapp_common-0.0.14.dev4}/quapp_common/component/callback/update_job_metadata.py

@@ -17,7 +17,12 @@ def update_job_metadata(job_response: JobResponse, callback_url: str):
     def _log_http_result(tag: str, resp):
         logger.info(
                 f"Request to {tag} completed with status code: {resp.status_code}")
-        if not resp.ok:
+        if resp.status_code in (401, 403):
+            logger.error(
+                    f"Request to {tag} was rejected with status code {resp.status_code}. "
+                    f"The job update is lost, so the platform will not see this state change. "
+                    f"Check that the response carries the user token and the project header.")
+        elif not resp.ok:
             logger.warning(
                     f"Unexpected status code received from {tag}: {resp.status_code}, response content: {resp.content}")
 
@@ -60,6 +65,11 @@ def update_job_metadata(job_response: JobResponse, callback_url: str):
     logger.info(
             f'Calling backend to update job metadata at URL: {callback_url}')
 
+    if not getattr(job_response, 'user_token', None):
+        logger.error(
+                'Job update is being sent without a user token, the backend will reject it. '
+                'The response was built without the invocation credentials.')
+
     request_body = generate_response(job_response)
 
     try:

{quapp_common-0.0.14.dev2 → quapp_common-0.0.14.dev4}/quapp_common/data/response/job_response.py

@@ -23,9 +23,18 @@ class JobResponse(object):
         self.job_result = job_result
         self.content_type = content_type
         self.job_histogram = job_histogram
-        self.user_identity = getattr(authentication, 'user_identity', None)
-        self.user_token = getattr(authentication, 'user_token', None)
+        self.authentication = authentication
         self.execution_time = execution_time
         self.status_code = status_code
         self.project_header = project_header
         self.workspace_header = workspace_header
+
+    @property
+    def authentication(self) -> Authentication:
+        return self._authentication
+
+    @authentication.setter
+    def authentication(self, authentication: Authentication) -> None:
+        self._authentication = authentication
+        self.user_identity = getattr(authentication, 'user_identity', None)
+        self.user_token = getattr(authentication, 'user_token', None)

{quapp_common-0.0.14.dev2 → quapp_common-0.0.14.dev4}/quapp_common/enum/language.py

@@ -14,6 +14,7 @@ class Language(BaseEnum):
   JAVASCRIPT = 'javascript'
   QSHARP = 'qsharp'
   C = 'c'
+  CPP = 'cpp'
 
   @staticmethod
   def resolve(language: str):

{quapp_common-0.0.14.dev2 → quapp_common-0.0.14.dev4}/quapp_common/util/response_utils.py

@@ -11,6 +11,8 @@ from .http_utils import CUSTOM_HEADER_VALUE
 from ..component.backend.job_fetcher import JobFetcher
 from ..config.logging_config import job_logger, redact
 from ..data.promise.post_processing_promise import PostProcessingPromise
+from ..data.response.authentication import Authentication
+from ..data.response.custom_header import CustomHeader
 from ..data.response.job_response import JobResponse
 from ..enum.runtime_phase import en_phrase_of
 from ..enum.status.job_status import JobStatus
@@ -195,7 +197,10 @@ def build_error_job_response(exception: Exception,
                              message: str = None,
                              stage: str = None,
                              phase=None,
-                             context: dict = None) -> JobResponse:
+                             context: dict = None,
+                             authentication: Authentication = None,
+                             project_header: CustomHeader = None,
+                             workspace_header: CustomHeader = None) -> JobResponse:
     """
     Builds and returns a JobResponse object populated with error-related information.
 
@@ -232,14 +237,18 @@ def build_error_job_response(exception: Exception,
     """
     if job_response is None:
         job_response = JobResponse()
-    job_response.provider_job_id = __extract_value(PROVIDER_JOB_ID, fetcher,
-                                                   post_promise)
-    job_response.authentication = __extract_authentication(fetcher,
-                                                           post_promise)
-    job_response.project_header = __extract_value(PROJECT_HEADER, fetcher,
-                                                  post_promise)
-    job_response.tenant_header = __extract_value(WORKSPACE_HEADER, fetcher,
-                                                 post_promise)
+
+    __apply_if_present(job_response, 'provider_job_id',
+                       __extract_value(PROVIDER_JOB_ID, fetcher, post_promise))
+    __apply_if_present(job_response, 'authentication',
+                       authentication
+                       or __extract_authentication(fetcher, post_promise))
+    __apply_if_present(job_response, 'project_header',
+                       project_header
+                       or __extract_value(PROJECT_HEADER, fetcher, post_promise))
+    __apply_if_present(job_response, 'workspace_header',
+                       workspace_header
+                       or __extract_value(WORKSPACE_HEADER, fetcher, post_promise))
     job_response.status_code = StatusCode.ERROR
     job_response.job_status = JobStatus.ERROR.value
 
@@ -281,6 +290,19 @@ def build_error_job_response(exception: Exception,
     return job_response
 
 
+
+def __apply_if_present(job_response: JobResponse, property_name: str, value):
+    """Only overwrite when a value is actually available.
+
+    The error path is often called without a fetcher or a post promise, so the
+    extracted value is None. Overwriting blindly used to wipe the credentials
+    already carried by the response, which made the resulting event reach the
+    backend without a token and get rejected with 401.
+    """
+    if value is not None:
+        setattr(job_response, property_name, value)
+
+
 def __extract_authentication(fetcher: JobFetcher,
                              post_promise: PostProcessingPromise):
     """

{quapp_common-0.0.14.dev2 → quapp_common-0.0.14.dev4/quapp_common.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quapp-common
-Version: 0.0.14.dev2
+Version: 0.0.14.dev4
 Summary: Quapp common library supporting Quapp Platform for Quantum Computing
 Author-email: "CITYNOW Co. Ltd. " <corp@citynow.vn>
 License: The MIT License (MIT)

{quapp_common-0.0.14.dev2 → quapp_common-0.0.14.dev4}/tests/test_language_dispatcher.py

@@ -18,3 +18,18 @@ class TestRunnerMapLanguageC(unittest.TestCase):
 
     def test_timeout(self):
         self.assertEqual(RUNNER_MAP[Language.C]['timeout'], 300)
+
+
+class TestLanguageCppEnum(unittest.TestCase):
+    def test_value_is_cpp(self):
+        self.assertEqual(Language.CPP.value, 'cpp')
+
+    def test_resolve(self):
+        self.assertEqual(Language.resolve('cpp'), Language.CPP)
+
+
+class TestRunnerMapLanguageCpp(unittest.TestCase):
+    def test_language_cpp_not_registered(self):
+        """C++ handlers run in-process through NativeQiskitBridge, never as a subprocess, so
+        having no runner is the correct state rather than a missing entry."""
+        self.assertNotIn(Language.CPP, RUNNER_MAP)