quapp-pyquil 0.0.4.dev1__tar.gz → 0.0.4.dev3__tar.gz

{quapp_pyquil-0.0.4.dev1/quapp_pyquil.egg-info → quapp_pyquil-0.0.4.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quapp-pyquil
-Version: 0.0.4.dev1
+Version: 0.0.4.dev3
 Summary: QApp pyquil library supporting QApp Platform for Quantum Computing
 Author-email: "CITYNOW Co. Ltd. " <corp@citynow.vn>
 License: The MIT License (MIT)
@@ -19,7 +19,7 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: <3.11,>=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: quapp-common==0.0.11.dev3
+Requires-Dist: quapp-common==0.0.11.dev6
 Requires-Dist: pyquil==4.15.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"

{quapp_pyquil-0.0.4.dev1 → quapp_pyquil-0.0.4.dev3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "quapp-pyquil"
-version = "0.0.4.dev1"
+version = "0.0.4.dev3"
 description = "QApp pyquil library supporting QApp Platform for Quantum Computing"
 readme = "README.md"
 authors = [{ name = "CITYNOW Co. Ltd. ", email = "corp@citynow.vn" }]
@@ -16,7 +16,7 @@ classifiers = [
 ]
 keywords = ["quapp", "qapp-pyquil", "quantum"]
 dependencies = [
-    "quapp-common==0.0.11.dev3",
+    "quapp-common==0.0.11.dev6",
     "pyquil==4.15.0"
 ]
 requires-python = ">=3.9,<3.11"

quapp_pyquil-0.0.4.dev3/qapp_pyquil/async_tasks/pyquil_circuit_export_task.py

@@ -0,0 +1,25 @@
+"""
+    QApp Platform Project pennylane_circuit_export_task.py Copyright © CITYNOW Co. Ltd. All rights reserved.
+"""
+from quapp_common.async_tasks.export_circuit_task import CircuitExportTask
+from quapp_common.data.async_task.circuit_export.backend_holder import BackendDataHolder
+from quapp_common.data.async_task.circuit_export.circuit_holder import CircuitDataHolder
+from quapp_common.data.response.custom_header import CustomHeader
+
+import requests
+
+class PyquilCircuitExportTask(CircuitExportTask):
+
+    def __init__(self, circuit_data_holder: CircuitDataHolder,
+                 backend_data_holder: BackendDataHolder,
+                 project_header: CustomHeader, workspace_header: CustomHeader):
+        super().__init__(circuit_data_holder, backend_data_holder,
+                         project_header, workspace_header)
+
+    def _transpile_circuit(self):
+        # no implementation needed for Pyquil
+        pass
+        
+    def do(self):
+        return
+

{quapp_pyquil-0.0.4.dev1 → quapp_pyquil-0.0.4.dev3}/qapp_pyquil/component/backend/pyquil_invocation.py

@@ -3,7 +3,6 @@
 """
 
 from quapp_common.component.backend.invocation import Invocation
-from quapp_common.config.logging_config import logger
 from quapp_common.config.thread_config import circuit_exporting_pool
 from quapp_common.data.async_task.circuit_export.backend_holder import BackendDataHolder
 from quapp_common.data.async_task.circuit_export.circuit_holder import CircuitDataHolder
@@ -21,25 +20,27 @@ class PyquilInvocation(Invocation):
         self.num_qubits = kwargs.get('num_qubits')
 
     def _export_circuit(self, circuit):
-        logger.info("[PyquilInvocation] _export_circuit()")
+        self.logger.info("[PyquilInvocation] _export_circuit()")
 
         circuit_export_task = PyquilCircuitExportTask(
             circuit_data_holder=CircuitDataHolder(circuit, self.circuit_export_url),
             backend_data_holder=BackendDataHolder(
                 self.backend_information, self.authentication.user_token
             ),
+            project_header=self.project_header,
+            workspace_header=self.workspace_header
         )
         circuit_exporting_pool.submit(circuit_export_task.do)
 
     def _create_provider(self):
-        logger.info('[PennylaneInvocation] _create_provider()')
+        self.logger.info('[PennylaneInvocation] _create_provider()')
 
         return PyquilProviderFactory.create_provider(
             provider_type=self.backend_information.provider_tag, sdk=self.sdk,
             authentication=self.backend_information.authentication)
 
     def _create_device(self, provider: Provider):
-        logger.info('[PennylaneInvocation] Creating device')
+        self.logger.info('[PennylaneInvocation] Creating device')
         return PyquilDeviceFactory.create_device(provider=provider,
                                                     device_specification=self.backend_information.device_name,
                                                     authentication=self.backend_information.authentication,

{quapp_pyquil-0.0.4.dev1 → quapp_pyquil-0.0.4.dev3}/qapp_pyquil/component/backend/pyquil_job_fetching.py

@@ -7,7 +7,6 @@ from quapp_common.config.logging_config import logger
 from quapp_common.enum.provider_tag import ProviderTag
 from quapp_common.enum.sdk import Sdk
 from quapp_common.enum.status.job_status import JobStatus
-from quapp_common.enum.status.status_code import StatusCode
 from pyquil import get_qc
 import pickle
 import os
@@ -52,7 +51,7 @@ class PyquilJobFetching(JobFetcher):
 
     def _get_job_status(self, job):
 
-        if (job.execution_duration_microseconds is not None):
+        if job.execution_duration_microseconds is not None:
             
             if os.path.exists(self.provider_job_id+".pkl"):
                 os.remove(self.provider_job_id+".pkl")

{quapp_pyquil-0.0.4.dev1 → quapp_pyquil-0.0.4.dev3}/qapp_pyquil/factory/pyquil_device_factory.py

@@ -11,7 +11,6 @@ from quapp_common.model.provider.provider import Provider
 from ..model.device.qapp_pyquil_device import QAppPyquilDevice
 from ..model.device.rigetti_pyquil_device import RigettiPyquilDevice
 
-
 class PyquilDeviceFactory(DeviceFactory):
 
     @staticmethod

{quapp_pyquil-0.0.4.dev1 → quapp_pyquil-0.0.4.dev3}/qapp_pyquil/factory/pyquil_handler_factory.py

@@ -2,22 +2,22 @@
     QApp Platform Project pyquil_handler_factory.py Copyright © CITYNOW Co. Ltd. All rights reserved.
 """
 
-from quapp_common.config.logging_config import logger
 from quapp_common.factory.handler_factory import HandlerFactory
 from quapp_common.handler.handler import Handler
 
 from ..handler.invocation_handler import InvocationHandler
-from ..handler.job_fetching_handler import JobFetchingHandler
-
+from quapp_common.config.logging_config import job_logger
 class PyquilHandlerFactory(HandlerFactory):
 
     @staticmethod
     def create_handler(event, circuit_preparation_fn, post_processing_fn) -> Handler:
-        logger.info("[PyquilHandlerFactory] create_handler()")
 
         request_data = event.json()
         provider_job_id = request_data.get("providerJobId")
 
+        logger = job_logger(request_data.get('jobId'))
+        logger.debug('Creating handler')
+
         if provider_job_id is None:
             logger.debug("[PyquilHandlerFactory] Create InvocationHandler")
             return InvocationHandler(
@@ -25,8 +25,7 @@ class PyquilHandlerFactory(HandlerFactory):
                 circuit_preparation_fn=circuit_preparation_fn,
                 post_processing_fn=post_processing_fn,
             )
-
-        logger.debug("Create JobFetchingHandler")
-        return JobFetchingHandler(
-            request_data=request_data, post_processing_fn=post_processing_fn
-        )
+        # logger.debug("Create JobFetchingHandler")
+        # return JobFetchingHandler(
+        #     request_data=request_data, post_processing_fn=post_processing_fn
+        # )

{quapp_pyquil-0.0.4.dev1 → quapp_pyquil-0.0.4.dev3}/qapp_pyquil/handler/invocation_handler.py

@@ -3,7 +3,6 @@
 """
 from quapp_common.data.request.invocation_request import InvocationRequest
 from quapp_common.handler.handler import Handler
-from quapp_common.config.logging_config import logger
 
 from ..component.backend.pyquil_invocation import PyquilInvocation
 
@@ -17,7 +16,7 @@ class InvocationHandler(Handler):
         self.circuit_preparation_fn = circuit_preparation_fn
 
     def handle(self):
-        logger.info("[InvocationHandler] handle()")
+        self.logger.info("[InvocationHandler] handle()")
 
         invocation_request = InvocationRequest(self.request_data)
 

{quapp_pyquil-0.0.4.dev1 → quapp_pyquil-0.0.4.dev3}/qapp_pyquil/model/device/qapp_pyquil_device.py

@@ -4,12 +4,10 @@
     Copyright © CITYNOW Co. Ltd. All rights reserved.
 """
 import time
-import math
 
 from quapp_common.data.response.authentication import Authentication
-from quapp_common.data.response.project_header import ProjectHeader
+from quapp_common.data.response.custom_header import CustomHeader
 from quapp_common.model.device.device import Device
-from quapp_common.config.logging_config import logger
 from quapp_common.data.device.circuit_running_option import CircuitRunningOption
 from quapp_common.model.provider.provider import Provider
 from quapp_common.enum.invocation_step import InvocationStep
@@ -18,11 +16,11 @@ from quapp_common.enum.invocation_step import InvocationStep
 class QAppPyquilDevice(Device):
     def __init__(self, provider: Provider, device_specification: str):
         super().__init__(provider, device_specification)
-        logger.debug('[QAppPyquilDevice] Initializing device specification')
+        self.logger.debug('[QAppPyquilDevice] Initializing device specification')
         self.device_specification = device_specification
 
     def _create_job(self, circuit, options: CircuitRunningOption):
-        logger.debug(
+        self.logger.debug(
             '[QAppPyquilDevice] Creating job with {0} shots'.format(
                 options.shots))
         
@@ -39,41 +37,41 @@ class QAppPyquilDevice(Device):
         return data
 
     def _is_simulator(self) -> bool:
-        logger.debug('[QAppPyquilDevice] Is simulator')
+        self.logger.debug('[QAppPyquilDevice] Is simulator')
         return True
 
     def _produce_histogram_data(self, job_result) -> dict | None:
-        logger.info('[PyquilDevice] Producing histogram data')
+        self.logger.info('[PyquilDevice] Producing histogram data')
 
         histogram = job_result.get('histogram')
 
         if histogram is None:
-            logger.debug("[PyquilDevice] Can't produce histogram")
+            self.logger.debug("[PyquilDevice] Can't produce histogram")
 
         return job_result.get('histogram')
 
     def _get_provider_job_id(self, job) -> str:
-        logger.debug('[PyquilDevice] Getting job id')
+        self.logger.debug('[PyquilDevice] Getting job id')
 
         # no job id in local simulator
         return ""
 
     def _get_job_status(self, job) -> str:
-        logger.debug('[PyquilDevice] Getting job status')
+        self.logger.debug('[PyquilDevice] Getting job status')
 
         return "DONE"
 
     def _get_job_result(self, job) -> dict:
-        logger.debug('[PyquilDevice] Getting job result')
+        self.logger.debug('[PyquilDevice] Getting job result')
 
         return job
 
     def _calculate_execution_time(self, job_result):
-        logger.debug('[PyquilDevice] Calculating execution time')
+        self.logger.debug('[PyquilDevice] Calculating execution time')
 
         self.execution_time = job_result.get('time_taken_execute')
 
-        logger.debug(
+        self.logger.debug(
             '[PyquilDevice] Execution time calculation was: {0} seconds'.format(
                 self.execution_time))
 
@@ -83,18 +81,13 @@ class QAppPyquilDevice(Device):
                     options: CircuitRunningOption,
                     callback_dict: dict,
                     authentication: Authentication,
-                    project_header: ProjectHeader):
-        """
-        @param project_header: project header
-        @param callback_dict: callback url dictionary
-        @param options: Options for run circuit
-        @param authentication: Authentication for calling quao server
-        @param post_processing_fn: Post-processing function
-        @param circuit: Circuit was run
-        """
+                    project_header: CustomHeader,
+                    workspace_header: CustomHeader):
+
         original_job_result, job_response = self._on_execution(
             authentication=authentication,
             project_header=project_header,
+            workspace_header=workspace_header,
             execution_callback=callback_dict.get(InvocationStep.EXECUTION),
             circuit=circuit,
             options=options)
@@ -115,4 +108,5 @@ class QAppPyquilDevice(Device):
                               post_processing_fn=post_processing_fn,
                               finalization_callback=callback_dict.get(
                                   InvocationStep.FINALIZATION),
-                              project_header=project_header)
+                              project_header=project_header,
+                              workspace_header= workspace_header)

quapp_pyquil-0.0.4.dev3/qapp_pyquil/model/device/rigetti_pyquil_device.py

@@ -0,0 +1,175 @@
+"""
+    QApp Platform Project
+    qapp_pyquil_device.py
+    Copyright © CITYNOW Co. Ltd. All rights reserved.
+"""
+import time
+import math
+import os
+
+from quapp_common.data.response.authentication import Authentication
+from quapp_common.data.response.custom_header import CustomHeader
+from quapp_common.model.device.device import Device
+from quapp_common.data.device.circuit_running_option import CircuitRunningOption
+from quapp_common.model.provider.provider import Provider
+from quapp_common.data.response.job_response import JobResponse
+
+from quapp_common.component.callback.update_job_metadata import update_job_metadata
+from quapp_common.enum.status.job_status import JobStatus
+from quapp_common.enum.media_type import MediaType
+from quapp_common.enum.status.status_code import StatusCode
+from quapp_common.data.callback.callback_url import CallbackUrl
+import pickle
+import time
+
+
+class RigettiPyquilDevice(Device):
+    def __init__(self, provider: Provider, device_specification: str):
+        super().__init__(provider, device_specification)
+        self.logger.debug('[RigettiPyquilDevice] Initializing device specification')
+        self.device_specification = device_specification
+
+    def _create_job(self, circuit, options: CircuitRunningOption):
+        self.logger.debug(
+            '[RigettiPyquilDevice] Creating job with {0} shots'.format(
+                options.shots))
+        
+        circuit.wrap_in_numshots_loop(options.shots)
+        executable = self.device.compile(circuit)
+
+        return self.device.qam.execute(executable)
+
+    def _is_simulator(self) -> bool:
+        self.logger.debug('[RigettiPyquilDevice] is quantum machine')
+        return False
+
+    def _get_provider_job_id(self, job) -> str:
+        self.logger.debug('[PyquilDevice] Getting job id')
+
+        return job.job_id
+
+    def _get_job_status(self, job) -> str:
+        self.logger.debug('[PyquilDevice] Getting job status')
+
+        return "RUNNING"
+
+    def _calculate_execution_time(self, job_result):
+        self.logger.debug('[PyquilDevice] Getting execution time {}',job_result)
+
+        # the time unit is miliseconds
+        return job_result.execution_duration_microseconds/1000
+
+    def _get_job_result(self, job):
+        
+        return self.device.qam.get_result(job)
+
+    def _produce_histogram_data(self, job_result) -> dict | None:
+        self.logger.info('[PyquilDevice] Producing histogram data')
+
+        return None
+
+    def _on_execution(self, authentication: Authentication,
+        project_header: CustomHeader,
+        workspace_header: CustomHeader,
+        execution_callback: CallbackUrl,
+        circuit,
+        options: CircuitRunningOption):
+        """
+
+        @param authentication: authentication information
+        @param project_header: project header information
+        @param execution_callback: execution step callback urls
+        @param circuit: circuit will be run
+        @param options: options will use for running
+        @return: job and job response
+        """
+        self.logger.debug("[Invocation] On execution")
+
+        job_response = JobResponse(authentication=authentication,
+                                   project_header=project_header,
+                                   status_code=StatusCode.DONE,
+                                   workspace_header=workspace_header)
+
+        update_job_metadata(job_response=job_response,
+                            callback_url=execution_callback.on_start)
+        try:
+            job = self._create_job(circuit=circuit, options=options)
+            job_response.provider_job_id = self._get_provider_job_id(job)
+            job_response.job_status = self._get_job_status(job)
+            original_job_result = None
+
+            while True:
+                
+                self.logger.debug("fetching job result")
+
+                try:
+                    res = self._get_job_result(job)
+                    self.logger.debug("Job result: {}".format(res))
+                    if res.execution_duration_microseconds is not None:
+                        job_response.job_status = JobStatus.DONE.value
+                        original_job_result = res
+                        break
+                except Exception as e:
+                    self.logger.debug("Job result not ready yet: {}".format(str(e)))
+                time.sleep(5)
+
+            self.logger.debug("Job result: {}".format(job_response))
+
+            update_job_metadata(job_response=job_response,
+                                callback_url=execution_callback.on_done)
+
+            return original_job_result, job_response
+
+        except Exception as exception:
+            self.logger.debug("Execute job failed with error {}".format(str(exception)))
+
+            job_response.status_code = StatusCode.ERROR
+            job_response.content_type = MediaType.APPLICATION_JSON
+            job_response.job_status = JobStatus.ERROR.value
+            job_response.job_result = {"error": str(exception)}
+
+            update_job_metadata(job_response=job_response,
+                                callback_url=execution_callback.on_error)
+            return None, None
+
+    def _on_analysis(self, job_response: JobResponse,
+                      analysis_callback: CallbackUrl,
+                      original_job_result):
+        """
+
+        @param job_response:
+        @param analysis_callback:
+        @param original_job_result:
+        @return:
+        """
+        self.logger.debug("[Invocation] On analysis")
+
+        update_job_metadata(job_response=job_response,
+                            callback_url=analysis_callback.on_start)
+
+        try:
+            job_response.job_histogram = self._produce_histogram_data(original_job_result)
+
+            self.execution_time = self._calculate_execution_time(original_job_result)
+            
+            job_response.execution_time = self.execution_time
+            self.logger.debug("Execution time: {}".format(job_response.execution_time))
+
+            update_job_metadata(
+                job_response=job_response,
+                callback_url=analysis_callback.on_done)
+
+            return job_response
+
+        except Exception as exception:
+            self.logger.error("Invocation - Exception when analyst job result : {0}".format(
+                str(exception)))
+
+            job_response.status_code = StatusCode.ERROR
+            job_response.content_type = MediaType.APPLICATION_JSON
+            job_response.job_status = JobStatus.ERROR.value
+            job_response.job_result = {"error": str(exception)}
+
+            update_job_metadata(job_response=job_response,
+                                callback_url=analysis_callback.on_error)
+            return None

{quapp_pyquil-0.0.4.dev1 → quapp_pyquil-0.0.4.dev3/quapp_pyquil.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quapp-pyquil
-Version: 0.0.4.dev1
+Version: 0.0.4.dev3
 Summary: QApp pyquil library supporting QApp Platform for Quantum Computing
 Author-email: "CITYNOW Co. Ltd. " <corp@citynow.vn>
 License: The MIT License (MIT)
@@ -19,7 +19,7 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: <3.11,>=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: quapp-common==0.0.11.dev3
+Requires-Dist: quapp-common==0.0.11.dev6
 Requires-Dist: pyquil==4.15.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"

{quapp_pyquil-0.0.4.dev1 → quapp_pyquil-0.0.4.dev3}/quapp_pyquil.egg-info/requires.txt

@@ -1,4 +1,4 @@
-quapp-common==0.0.11.dev3
+quapp-common==0.0.11.dev6
 pyquil==4.15.0
 
 [dev]

quapp_pyquil-0.0.4.dev1/qapp_pyquil/async_tasks/pyquil_circuit_export_task.py

@@ -1,62 +0,0 @@
-"""
-    QApp Platform Project pennylane_circuit_export_task.py Copyright © CITYNOW Co. Ltd. All rights reserved.
-"""
-from quapp_common.async_tasks.export_circuit_task import CircuitExportTask
-# from ..quapp_common.config.logging_config import logger
-# from pyquil.latex import to_latex
-# import os
-# import subprocess
-
-
-class PyquilCircuitExportTask(CircuitExportTask):
-        
-    def _convert(self):
-        
-        # circuit = self.circuit_data_holder.circuit
-
-        # latex_code = to_latex(circuit)
-
-        # latex_filename = "quantikz.tex"
-        # pdf_filename = "quantikz.pdf"
-        # svg_filename = "quantikz.svg"
-
-        
-        # try:
-
-        #     with open(latex_filename, "w") as latex_file:
-        #         latex_file.write(latex_code)
-
-        #     subprocess.run(["pdflatex", latex_filename], check=True)
-        #     subprocess.run(["pdf2svg", pdf_filename, svg_filename], check=True)
-
-        #     with open(svg_filename, "rb") as svg_file:
-        #         svg_bytes = svg_file.read()
-
-        # except subprocess.CalledProcessError:
-        #     logger.error('[PyquilCircuitExportTask] Fail to convert to svg')
-        #     return None
-        
-        # finally:
-            
-        #     logger.info('[PyquilCircuitExportTask] Cleaning up temporary files')
-
-        #     files_to_cleanup = [
-        #         "quantikz.tex",    # LaTeX source file
-        #         "quantikz.pdf",    # Generated PDF file
-        #         "quantikz.svg",    # Generated SVG file
-        #         "quantikz.aux",    # Auxiliary file created during LaTeX compilation
-        #         "quantikz.log",    # Log file created during LaTeX compilation
-        #     ]
-        #     # Clean up each file if it exists
-        #     for file in files_to_cleanup:
-        #         try:
-        #             os.remove(file)
-        #             logger.info(f'[PyquilCircuitExportTask] Successfully removed: {file}')
-        #         except FileNotFoundError:
-        #             logger.error(f'[PyquilCircuitExportTask] File not found: {file}')
-
-        
-
-        # return svg_bytes
-
-        return None

quapp_pyquil-0.0.4.dev1/qapp_pyquil/model/device/rigetti_pyquil_device.py

@@ -1,75 +0,0 @@
-"""
-    QApp Platform Project
-    qapp_pyquil_device.py
-    Copyright © CITYNOW Co. Ltd. All rights reserved.
-"""
-import time
-import math
-import os
-
-from quapp_common.data.response.authentication import Authentication
-from quapp_common.data.response.project_header import ProjectHeader
-from quapp_common.model.device.device import Device
-from quapp_common.config.logging_config import logger
-from quapp_common.data.device.circuit_running_option import CircuitRunningOption
-from quapp_common.model.provider.provider import Provider
-from quapp_common.enum.invocation_step import InvocationStep
-
-import pickle
-
-
-class RigettiPyquilDevice(Device):
-    def __init__(self, provider: Provider, device_specification: str):
-        super().__init__(provider, device_specification)
-        logger.debug('[RigettiPyquilDevice] Initializing device specification')
-        self.device_specification = device_specification
-
-    def _create_job(self, circuit, options: CircuitRunningOption):
-        logger.debug(
-            '[RigettiPyquilDevice] Creating job with {0} shots'.format(
-                options.shots))
-        
-        circuit.wrap_in_numshots_loop(options.shots)
-        executable = self.device.compile(circuit)
-
-        return self.device.qam.execute(executable)
-
-    def _is_simulator(self) -> bool:
-        logger.debug('[RigettiPyquilDevice] is quantum machine')
-        return False
-
-    def _get_provider_job_id(self, job) -> str:
-        logger.debug('[PyquilDevice] Getting job id')
-
-        job_id = job.job_id
-
-        save_dir = "/home/app"
-
-        file_path = os.path.join(save_dir, f"{job_id}.pkl")
-
-        with open(file_path, "wb") as f:
-            pickle.dump(job,f)
-
-        print("Job ID: ", job_id)
-
-        return job_id
-
-    def _get_job_status(self, job) -> str:
-        logger.debug('[PyquilDevice] Getting job status')
-
-        return "RUNNING"
-
-    def _calculate_execution_time(self, job_result):
-
-        logger.debug('[PyquilDevice] Getting execution time')
-        return None
-
-    def _get_job_result(self, job) -> dict:
-        
-        return None
-
-    def _produce_histogram_data(self, job_result) -> dict | None:
-        logger.info('[PyquilDevice] Producing histogram data')
-
-        return None
-