luna-quantum 0.0.29__py3-none-any.whl → 0.0.33__py3-none-any.whl

{luna_quantum-0.0.29.dist-info → luna_quantum-0.0.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: luna-quantum
-Version: 0.0.29
+Version: 0.0.33
 Summary: Python SDK for Aqarios' Luna Platform
 Home-page: https://aqarios.com/
 License: Apache-2.0

{luna_quantum-0.0.29.dist-info → luna_quantum-0.0.33.dist-info}/RECORD

@@ -1,12 +1,12 @@
 luna_sdk/__init__.py,sha256=9s6JkcSeRF4WtFo80TelzXXHFhX8w7fXiaJr59V9ScM,100
 luna_sdk/controllers/__init__.py,sha256=ivTapH8np5mQeVEevxwsWawCtVSG4Wep72rNp7nEZXw,60
-luna_sdk/controllers/custom_login_client.py,sha256=1sc1h0vLoDEWhMIm3zWp03Ff54C3-9CK84KIM2t57a4,2240
-luna_sdk/controllers/luna_platform_client.py,sha256=1IRspVMkwcEaKYJhr1NDQ0kWXu7DnQ1tqQZunDOmVXo,1877
-luna_sdk/controllers/luna_q.py,sha256=IVaclfTQKPSY28rucssWsLSsmXHA5pS-CB_kmPLbchg,1230
-luna_sdk/controllers/luna_solve.py,sha256=nFSqgB0UEC8VLvfDl3Iinm8cfos08vWlEg8lVgzsMX0,1777
-luna_sdk/controllers/luna_transform.py,sha256=eFUU1RafYMUPZ-E_QZNQfYD-zMkcZOvwYtwgmvKHsXQ,1286
+luna_sdk/controllers/luna_http_client.py,sha256=_q3_o-bjC61uQMnNTfbbGei0eNR_AoIv-2R1cYRfEgU,819
+luna_sdk/controllers/luna_platform_client.py,sha256=EH1jxruuRKwaJ1Vos79PGT4-hwp7jdoSaRFKqjUMbZA,2406
+luna_sdk/controllers/luna_q.py,sha256=cv28o2fYDSaI8iAsfMYWtR68mfuUDxY3jmBWY2KnkRk,1199
+luna_sdk/controllers/luna_solve.py,sha256=ioMdB7Rlx-1-XB5WE5OT8oVlO_T1l5T64R-ccaNUCAA,1797
+luna_sdk/controllers/luna_transform.py,sha256=7kdIp5oRMG1NQZ1hBSkcNrj-z6g_2dWvQZ4j8BK3M0A,1337
 luna_sdk/error/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-luna_sdk/error/http_error_utils.py,sha256=1-Q-W-_RaHKlA2zOXJLLaZamBWNQpf9Oc4SAX4hJdEk,3317
+luna_sdk/error/http_error_utils.py,sha256=qZ4a43GVR35-bn3QTVmGZBJzEjieo43r36M2G5rfIyw,3509
 luna_sdk/exceptions/__init__.py,sha256=DSKaPN374rR2zccmpLvlqntxDsjFwgSexXtva795ae0,52
 luna_sdk/exceptions/encryption_exception.py,sha256=qe38EPRen4c63ti6bbA3jXl4PK48Ommi_cb2Lvhn8tg,264
 luna_sdk/exceptions/luna_exception.py,sha256=m7U3qFpP9Sc77Z3RG9I4bQXsJSQuVeBLvfHQWziC9sQ,114
@@ -23,8 +23,8 @@ luna_sdk/interfaces/clients/luna_transform_i.py,sha256=xpS2ODs83rICbA3oAKzf80rpB
 luna_sdk/interfaces/cplex_repo_i.py,sha256=a2CWG1m4YmQAlcM022Xfk09BHVmcd3y2H-GMr1N4vx8,3786
 luna_sdk/interfaces/info_repo_i.py,sha256=hCUYNoqjAKwz6l-61XtymX-UboosDX1RaTTiX64EXXc,1345
 luna_sdk/interfaces/lp_repo_i.py,sha256=hixIKvJ8jz9VOUi33B3K2VvFLcR7eKfeooJwktquyhc,3052
-luna_sdk/interfaces/optimization_repo_i.py,sha256=jaq6YXmFtUb6BbsLJos6B9VSzBUJ6YxgscNm6DyIl3M,6154
-luna_sdk/interfaces/qpu_token_repo_i.py,sha256=kokPGQj7k1E2UzG1W1ZycjET5ZPvjdQl1kqBT2vGTNM,4505
+luna_sdk/interfaces/optimization_repo_i.py,sha256=4JZikxWTJZTX4tG85ydSP711WROQ5B8RtbvOp1EDvxE,6202
+luna_sdk/interfaces/qpu_token_repo_i.py,sha256=q5aWiGxFnuRSasgHcceRAjQ0NvMPRoBfkeJHCByBy_0,4626
 luna_sdk/interfaces/repository_i.py,sha256=vJz8pbggkuLLC333qzjepj3TMPh49LUnyh3pJDlcGi0,287
 luna_sdk/interfaces/solutions_repo_i.py,sha256=YmQxgDGSLZNQ-P7jzlw1zTnut5Q1KVeRbcJEuocB3VQ,7767
 luna_sdk/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -33,8 +33,8 @@ luna_sdk/repositories/circuit_repo.py,sha256=h3Moypl-pba8J-sNTBsOxnbKtu6RCmmX5c_
 luna_sdk/repositories/cplex_repo.py,sha256=6vlx6YTJoDSWFSZDDNrPk3E7pa5WWGqG25bhTwQdqHQ,5098
 luna_sdk/repositories/info_repo.py,sha256=GzRW5RwhRJrNjujw8Y7vJY8vV_tHzbfwXo0viHuxqUM,1270
 luna_sdk/repositories/lp_repo.py,sha256=T44XMbdbW7k9a4z6JgIj1kb0bBZxepn-93vxdZOQa80,4370
-luna_sdk/repositories/optimization_repo.py,sha256=UHqJ_dZ9jyQF205naREyk10FUCuC6HfJ1dAxjMBS39M,6025
-luna_sdk/repositories/qpu_token_repo.py,sha256=_9r418j-wHksZ-cSNHeQb_slz7yn5WniovjV7qv2e0E,4343
+luna_sdk/repositories/optimization_repo.py,sha256=xHjMdXhzdwt9DtZG7AvGtUgOqWH142veOpAzaNe-nxk,6078
+luna_sdk/repositories/qpu_token_repo.py,sha256=6V3PH2YLMoWx6Dv6hxDoe2ohXH2mRN37nfvzVS6bHDA,5063
 luna_sdk/repositories/solutions_repo.py,sha256=Q5Q30oRyUnayXkp4z_jPcjDpxYRoPjzWBWUqg2EAFWQ,9242
 luna_sdk/schemas/__init__.py,sha256=lTix3zUl2Z8ZLA2BTF4pls5S-kqlVZ3cIdAZwGxPSUI,248
 luna_sdk/schemas/circuit.py,sha256=r3Bv0lyhrvFoI3Gf8eq-PS3kyivTWY3IJmRH0X2LoCk,1067
@@ -46,25 +46,27 @@ luna_sdk/schemas/create/qubo.py,sha256=5Y_jWicEnoV82Ubc-f0a_qy9hCuPBumhsGWY8wzMI
 luna_sdk/schemas/create/solution.py,sha256=K97JHH-p5z0P_niTVX6YBPoDc0rgIpJG5O4uaUhcs48,410
 luna_sdk/schemas/enums/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 luna_sdk/schemas/enums/circuit.py,sha256=smz_DouDo_K8rs4N5aIOj2PS9w6DX1CFYX0bv6f6JFw,252
-luna_sdk/schemas/enums/optimization.py,sha256=K-lv6PLJ4qo4vNVEKHsLU1rEv-QnFfl_FlN1xqZOXUc,170
+luna_sdk/schemas/enums/optimization.py,sha256=XtFdcfLxGe-MAL64itjxszhRkTcUzUf83tO-5DBVLeY,198
 luna_sdk/schemas/enums/problem.py,sha256=HWL6Lc1pqPtJ0J-rXkUTL6WHe2fiBY1ctuZvDnx1hmM,754
-luna_sdk/schemas/enums/qpu_token_type.py,sha256=UwaZoaCRAc2x_sLszRP55RwuU03u5GlJ-oK0u84Tbgo,119
+luna_sdk/schemas/enums/qpu_token_type.py,sha256=KBRrB8ExuTTmpp48obxdJGWwWEHb7xgq9Ajjwptl1VY,105
 luna_sdk/schemas/enums/solution.py,sha256=Vax6MX62UDwApbwzf1nrhuFWw1Iiq77gUch7_1roCYo,114
 luna_sdk/schemas/enums/status.py,sha256=KHaOgePqB3GNhFYLo2Sp-JAEXBPN_ZVDmj2WobrT5N4,204
 luna_sdk/schemas/enums/timeframe.py,sha256=vwoZsgAYGvqF67qdcXMEnHkqbiRcVY5uK-4-ZTFcurI,238
 luna_sdk/schemas/error_message.py,sha256=svCs-mWQsp3BMEhzZFqskbyP6iS78eVUOPaiWFc4sEQ,307
-luna_sdk/schemas/optimization.py,sha256=cB57hs_7VsE8h4YQGj3XuX4Mqp3SZmnu2Y90s4jl1jw,2033
+luna_sdk/schemas/optimization.py,sha256=pCbDL93PFGf7IOGz-0PHFrrpOwQdszm78WnS0oo2xqU,1884
 luna_sdk/schemas/optimization_formats/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 luna_sdk/schemas/optimization_formats/bqm.py,sha256=rrmiZYe_iEdgBFusJeJfY8PVSxgf1Wv79FgMQUm2YVs,910
 luna_sdk/schemas/optimization_formats/cqm.py,sha256=VZiNJy4yc-8o3gHoH0E-uaNOHj7UfAGCqznTzKBv0NQ,4257
 luna_sdk/schemas/optimization_formats/lp.py,sha256=iXFDBmHktHsYc79ngSraylCpa-EVMFwN01788fnjFzY,175
 luna_sdk/schemas/optimization_formats/qm.py,sha256=yUEZF7FOvXv1Mb5FMiX1q0Rk5w2ltrh7HInfFEiVSXU,912
+luna_sdk/schemas/optimization_formats/qubo.py,sha256=YN-VbPGTgqOKJuJ7t_TT8H_WIWr1ifU974K98W9Blao,135
 luna_sdk/schemas/pretty_base.py,sha256=ZyVdwdY5JfmNlfqZDm6MdTs5roNGtv0Pe805r4N25Z4,1845
-luna_sdk/schemas/qpu_token.py,sha256=SRpqMynft7GwiOlEQCYkVQyfcbtm9szuXIHQRtgRU_s,1575
+luna_sdk/schemas/qpu_token.py,sha256=CFKbAhFgo0G-LO_lameHH4-iOFUJWx9hmMWi3xQwURw,1508
 luna_sdk/schemas/representation.py,sha256=0RKVV0XxHOJZ1o9grxTq5ri3cGLziyCFObDwQuXIOEY,364
 luna_sdk/schemas/rest/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 luna_sdk/schemas/rest/qpu_token/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-luna_sdk/schemas/rest/qpu_token/token_provider.py,sha256=yDD17uIuio5FisarDBiGQwMpl-_QXRYttuFAZ9w-V00,1430
+luna_sdk/schemas/rest/qpu_token/qpu_token_source.py,sha256=EPMXHpgxqsQ4uJ1hlwe5gPdSsjuHEuKKAIMtBFgPJ1A,583
+luna_sdk/schemas/rest/qpu_token/token_provider.py,sha256=3Gecn2AmN7E_wAPUac_c55Fg-LwdDKsgbwAN2-0msJU,2985
 luna_sdk/schemas/solution.py,sha256=IRtZneNRN5IbSEMHKHc0NYJ7lf74RxZTHoYJI7z2QoY,6871
 luna_sdk/schemas/solver_info.py,sha256=ZUCdTI8zpPZ8EquLYyrLU35pZ4VkzcPUSYeQWkdijHM,799
 luna_sdk/schemas/solver_parameters/aws/__init__.py,sha256=CXjKWzgnP_d1_RvQUfWyaaWvsZ1FxLJN5K61QmRa-uw,33
@@ -157,8 +159,8 @@ luna_sdk/schemas/wrappers/__init__.py,sha256=1zq5BWRjDidbRJ346JOCSbP6Q9rhf4NiLhZ
 luna_sdk/schemas/wrappers/datetime_wrapper.py,sha256=6usmPJNRYA4Fe_-0NGwe7RYams46CCAXpJs8YULu_yc,794
 luna_sdk/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 luna_sdk/utils/parameter_finder.py,sha256=LKkd1upH3Djd6eqkcSQ2feNwPUiKi8soYkx6JT1_VSg,2937
-luna_sdk/utils/qpu_tokens.py,sha256=XpUNI102TLshfR85ZxvSFmXmH1fb1JAI8NKlIiuWEqc,1535
-luna_quantum-0.0.29.dist-info/LICENSE,sha256=rwwuFPLz36oRvjWu2oEeX42Qtn9gmbh7zRC2OqCFNaI,11342
-luna_quantum-0.0.29.dist-info/METADATA,sha256=STnBLAwQav1LezmFuJqjCyUepQIDFnYcRl2eS7kIb0w,2311
-luna_quantum-0.0.29.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-luna_quantum-0.0.29.dist-info/RECORD,,
+luna_sdk/utils/qpu_tokens.py,sha256=xrh5KSoWzbul-6eRa0ELH9iwEENanE7PIms7jlCt3NY,1641
+luna_quantum-0.0.33.dist-info/LICENSE,sha256=rwwuFPLz36oRvjWu2oEeX42Qtn9gmbh7zRC2OqCFNaI,11342
+luna_quantum-0.0.33.dist-info/METADATA,sha256=5ojTfod6BKHtIKnRn_utUm3CVd9OifvhK8Lk2xqhD8o,2311
+luna_quantum-0.0.33.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+luna_quantum-0.0.33.dist-info/RECORD,,

luna_sdk/controllers/luna_http_client.py

@@ -0,0 +1,27 @@
+from importlib.metadata import version
+
+import httpx
+from httpx import Client, Response
+
+from luna_sdk.error.http_error_utils import HttpErrorUtils
+from luna_sdk.exceptions.timeout_exception import TimeoutException
+
+
+class LunaHTTPClient(Client):
+    _version: str = version("luna-quantum")
+
+    _user_agent: str = f"LunaSDK/{_version}"
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.headers["User-Agent"] = self._user_agent
+
+    def request(self, *args, **kwargs) -> Response:
+        try:
+            response: Response = super().request(*args, **kwargs)
+        except httpx.TimeoutException:
+            # Handle all possible in httpx timeout exceptions
+            raise TimeoutException()
+        HttpErrorUtils.check_for_error(response)
+        return response

luna_sdk/controllers/luna_platform_client.py

@@ -1,21 +1,41 @@
 import os
-from typing import Optional
+from enum import Enum
+from typing import Optional, Literal
 
-from httpx import Client
+import httpx
 
-from luna_sdk.controllers.custom_login_client import CustomLoginClient
+from luna_sdk.controllers.luna_http_client import LunaHTTPClient
+from luna_sdk.error.http_error_utils import HttpErrorUtils
 from luna_sdk.interfaces.clients.client_i import IClient
 
 
+class LunaPrefixEnum(str, Enum):
+    LUNA_SOLVE = "luna-solve"
+    LUNA_Q = "luna-q"
+
+
+def check_httpx_exceptions(response):
+    HttpErrorUtils.check_for_error(response)
+
+
+class APIKeyAuth(httpx.Auth):
+    def __init__(self, token):
+        self.token = token
+
+    def auth_flow(self, request):
+        request.headers["Luna-API-Key"] = self.token
+        yield request
+
+
 class LunaPlatformClient(IClient):
     _base_url: str = ""
 
-    _client: Client = None  # type: ignore
+    _client: httpx.Client = None  # type: ignore
 
     def __init__(
         self,
-        email: str,
-        password: str,
+        api_key: str,
+        api: LunaPrefixEnum,
         base_url: str = os.getenv("LUNA_BASE_URL", "https://api.aqarios.com"),
         timeout: Optional[float] = 240.0,
     ):
@@ -26,10 +46,10 @@ class LunaPlatformClient(IClient):
 
         Parameters
         ----------
-        email:
-            User's email
-        password:
-            User's password
+        api_key:
+            User's API key
+        api: str
+            Current API with which luna client is working. Can be luna-solve or luna-q.
         base_url:
             Base API URL.
             If you want to use API not on your local PC then change it.
@@ -41,17 +61,15 @@ class LunaPlatformClient(IClient):
             itself will time out after 240 seconds.
             Default: 240.0
         """
-        self._base_url = f"{base_url}/api"
+        self._base_url = f"{base_url}/{api.value}/api/v1"
 
         # setup client
-
-        self._client = CustomLoginClient(
-            email=email,
-            password=password,
-            login_url=f"{base_url}/accessToken",
+        self._client = LunaHTTPClient(
+            auth=APIKeyAuth(api_key),
             base_url=self._base_url,
             follow_redirects=True,
             timeout=timeout,
+            event_hooks={"response": [check_httpx_exceptions]},
         )
 
     def __del__(self):

luna_sdk/controllers/luna_q.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from luna_sdk.controllers.luna_platform_client import LunaPlatformClient
+from luna_sdk.controllers.luna_platform_client import LunaPlatformClient, LunaPrefixEnum
 from luna_sdk.interfaces import ICircuitRepo
 from luna_sdk.interfaces.clients.luna_q_i import ILunaQ
 from luna_sdk.interfaces.qpu_token_repo_i import IQpuTokenRepo
@@ -11,23 +11,21 @@ class LunaQ(LunaPlatformClient, ILunaQ):
     qpu_token: IQpuTokenRepo = None  # type: ignore
     circuit: ICircuitRepo = None  # type: ignore
 
-    def __init__(self, email: str, password: str, timeout: Optional[float] = 240.0):
+    def __init__(self, api_key: str, timeout: Optional[float] = 240.0):
         """
         LunaQ is the main entrypoint for all LunaQ related tasks.
 
         Parameters
         ----------
-        email: str
-            User's email
-        password: str
-            User's password
+        api_key: str
+            User's API key
         timeout: float
             Default timeout in seconds for the requests via the LunaQ client. `None`
             means that the SDK uses no timeouts. Note that either way the Luna platform
             itself will time out after 240 seconds.
             Default: 240.0
         """
-        super().__init__(email=email, password=password, timeout=timeout)
+        super().__init__(api_key=api_key, api=LunaPrefixEnum.LUNA_Q, timeout=timeout)
 
         self.circuit = CircuitRepo(self._client)
         self.qpu_token = QpuTokenRepo(self._client)

luna_sdk/controllers/luna_solve.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from luna_sdk.controllers.luna_platform_client import LunaPlatformClient
+from luna_sdk.controllers.luna_platform_client import LunaPlatformClient, LunaPrefixEnum
 from luna_sdk.interfaces import ISolutionsRepo
 from luna_sdk.interfaces.clients.luna_solve_i import ILunaSolve
 from luna_sdk.interfaces.info_repo_i import IInfoRepo
@@ -18,23 +18,25 @@ class LunaSolve(LunaPlatformClient, ILunaSolve):
     qpu_token: IQpuTokenRepo = None  # type: ignore
     info: IInfoRepo = None  # type: ignore
 
-    def __init__(self, email: str, password: str, timeout: Optional[float] = 240.0):
+    def __init__(self, api_key: str, timeout: Optional[float] = 240.0):
         """
         LunaSolve is the main entrypoint for all LunaSolve related tasks.
 
         Parameters
         ----------
-        email: str
-            User's email
-        password: str
-            User's password
+        api_key: str
+            User's API key
         timeout: float
             Default timeout in seconds for the requests via the LunaQ client. `None`
             means that the SDK uses no timeouts. Note that either way the Luna platform
             itself will time out after 240 seconds.
             Default: 240.0
         """
-        super().__init__(email=email, password=password, timeout=timeout)
+        super().__init__(
+            api_key=api_key,
+            api=LunaPrefixEnum.LUNA_SOLVE,
+            timeout=timeout,
+        )
 
         self.optimization = OptimizationRepo(self._client)
         self.solution = SolutionsRepo(self._client)

luna_sdk/controllers/luna_transform.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from luna_sdk.controllers.luna_platform_client import LunaPlatformClient
+from luna_sdk.controllers.luna_platform_client import LunaPlatformClient, LunaPrefixEnum
 from luna_sdk.interfaces.clients.luna_transform_i import ILunaTransform
 from luna_sdk.interfaces.cplex_repo_i import ICplexRepo
 from luna_sdk.interfaces.lp_repo_i import ILPRepo
@@ -12,23 +12,29 @@ class LunaTransform(LunaPlatformClient, ILunaTransform):
     cplex: ICplexRepo = None  # type: ignore
     lp: ILPRepo = None  # type: ignore
 
-    def __init__(self, email: str, password: str, timeout: Optional[float] = 240.0):
+    def __init__(
+        self,
+        api_key: str,
+        timeout: Optional[float] = 240.0,
+    ):
         """
         LunaTransform is the main entrypoint for all LunaTransform related tasks.
 
         Parameters
         ----------
-        email: str
-            User's email
-        password: str
-            User's password
+        api_key: str
+            User's API key
         timeout: float
             Default timeout in seconds for the requests via the LunaQ client. `None`
             means that the SDK uses no timeouts. Note that either way the Luna platform
             itself will time out after 240 seconds.
             Default: 240.0
         """
-        super().__init__(email=email, password=password, timeout=timeout)
+        super().__init__(
+            api_key=api_key,
+            api=LunaPrefixEnum.LUNA_SOLVE,
+            timeout=timeout,
+        )
 
         self.cplex = CplexRepo(self._client)
         self.lp = LPRepo(self._client)

luna_sdk/error/http_error_utils.py

@@ -1,7 +1,8 @@
 import logging
 from typing import Optional
 
-from httpx import HTTPStatusError, RequestError, Response
+import httpx
+from httpx import RequestError, Response
 
 from luna_sdk.exceptions.luna_server_exception import LunaServerException
 from luna_sdk.schemas.error_message import ErrorMessage
@@ -50,6 +51,12 @@ class HttpErrorUtils:
                 " leading to a timeout. Try reducing the size of the optimization.",
             )
 
+        elif response.status_code == 403:
+            exception = create_error_message(
+                "FORBIDDEN",
+                response.text,
+            )
+
         return exception
 
     @staticmethod
@@ -70,15 +77,15 @@ class HttpErrorUtils:
             If an error occurred with the request outside the http status codes 4xx and 5xx.
         """
         try:
+            response.read()
             response.raise_for_status()
-        except HTTPStatusError as e:
+        except httpx.HTTPStatusError as e:
             exception: Optional[LunaServerException]
 
             try:
                 error_msg: ErrorMessage = ErrorMessage.model_validate_json(
                     response.text
                 )
-
                 # Convert the error message to the correct exception
                 exception = LunaServerException(response.status_code, error_msg)
 

luna_sdk/interfaces/optimization_repo_i.py

@@ -5,9 +5,10 @@ from typing import List, Optional
 from dimod import BinaryQuadraticModel, ConstrainedQuadraticModel
 
 from luna_sdk.interfaces.repository_i import IRepository
-from luna_sdk.schemas.enums.optimization import InputType
+from luna_sdk.schemas.enums.optimization import OptFormat
 from luna_sdk.schemas.enums.timeframe import TimeframeEnum
 from luna_sdk.schemas.optimization import Optimization
+from luna_sdk.schemas.solution import Numeric
 from luna_sdk.schemas.use_cases import UseCase
 
 
@@ -35,7 +36,7 @@ class IOptimizationRepo(IRepository, ABC):
     def get_all(
         self,
         timeframe: Optional[TimeframeEnum] = None,
-        input_type: Optional[InputType] = None,
+        input_type: Optional[OptFormat] = None,
         limit: int = 50,
         offset: int = 0,
         **kwargs,
@@ -48,7 +49,7 @@ class IOptimizationRepo(IRepository, ABC):
         timeframe: Optional[TimeframeEnum]
             Only return optimizations created within a specified timeframe.
             Default None.
-        input_type: Optional[InputType]
+        input_type: Optional[OptFormat]
             Only return optimizations of a specified input type. Default None.
         limit:
             Limit the number of optimizations to be returned. Default value 50.
@@ -66,7 +67,7 @@ class IOptimizationRepo(IRepository, ABC):
 
     @abstractmethod
     def create_from_qubo(
-        self, name: str, matrix: List[List[float]], **kwargs
+        self, name: str, matrix: List[List[Numeric]], **kwargs
     ) -> Optimization:
         """
         Create an optimization from a QUBO matrix.

luna_sdk/interfaces/qpu_token_repo_i.py

@@ -18,7 +18,7 @@ class IQpuTokenRepo(IRepository, ABC):
         **kwargs,
     ) -> QpuTokenOut:
         """
-        Create organization QPU token
+        Create QPU token
 
         Parameters
         ----------
@@ -29,8 +29,8 @@ class IQpuTokenRepo(IRepository, ABC):
         token: str
             Token
         token_type: QpuTokenTypeEnum
-            There are two types of QPU tokens: PERSONAL and ORGANIZATION.
-            All users of an organization can use organization QPU tokens.
+            There are two types of QPU tokens: PERSONAL and GROUP.
+            All users of a group can use group QPU tokens.
             User QPU tokens can only be used by the user who created them.
         encryption_key: Optional[str]
             Encryption key to be used for encryption of QPU tokens.
@@ -50,6 +50,8 @@ class IQpuTokenRepo(IRepository, ABC):
         filter_provider: Optional[str] = None,
         name: Optional[str] = None,
         token_type: Optional[QpuTokenTypeEnum] = None,
+        limit: Optional[int] = None,
+        offset: Optional[int] = None,
         **kwargs,
     ) -> Dict[QpuTokenTypeEnum, List[QpuTokenOut]]:
         """
@@ -62,8 +64,12 @@ class IQpuTokenRepo(IRepository, ABC):
         name: Optional[str]
             Name of the QPU token that should be retrieved
         token_type: Optional[QpuTokenTypeEnum]
-            If you want to retrieve only user or organization QPU tokens
+            If you want to retrieve only user or group QPU tokens
             otherwise all QPU tokens will be retrieved
+        limit: Optional[int]
+            Number of items to fetch. Default is 10.
+        offset: Optional[int]
+            Optional. Number of items to skip. Default is 0.
         **kwargs
             Parameters to pass to `httpx.request`.
 
@@ -84,8 +90,8 @@ class IQpuTokenRepo(IRepository, ABC):
         name: str
             Name of the QPU token that should be retrieved
         token_type: QpuTokenTypeEnum
-            There are two types of QPU tokens: PERSONAL and ORGANIZATION.
-            All users of an organization can use organization QPU tokens.
+            There are two types of QPU tokens: PERSONAL and GROUP.
+            All users of a group can use group QPU tokens.
             User QPU tokens can only be used by the user who created them.
         **kwargs
             Parameters to pass to `httpx.request`.
@@ -106,7 +112,7 @@ class IQpuTokenRepo(IRepository, ABC):
         **kwargs,
     ) -> QpuTokenOut:
         """
-        Update organization QPU token by id.
+        Update QPU token by id.
 
         Parameters
         ----------
@@ -115,8 +121,8 @@ class IQpuTokenRepo(IRepository, ABC):
         new_name: str
             The new name
         token_type: QpuTokenTypeEnum
-            There are two types of QPU tokens: PERSONAL and ORGANIZATION.
-            All users of an organization can use organization QPU tokens.
+            There are two types of QPU tokens: PERSONAL and GROUP.
+            All users of a group can use group QPU tokens.
             User QPU tokens can only be used by the user who created them.
         **kwargs
             Parameters to pass to `httpx.request`.
@@ -131,15 +137,15 @@ class IQpuTokenRepo(IRepository, ABC):
     @abstractmethod
     def delete(self, name: str, token_type: QpuTokenTypeEnum, **kwargs) -> None:
         """
-        Delete organization QPU token by name.
+        Delete QPU token by name.
 
         Parameters
         ----------
         name: str
             Name of the QPU token that should be deleted
         token_type: QpuTokenTypeEnum
-            There are two types of QPU tokens: PERSONAL and ORGANIZATION.
-            All users of an organization can use organization QPU tokens.
+            There are two types of QPU tokens: PERSONAL and GROUP.
+            All users of a group can use organization QPU tokens.
             User QPU tokens can only be used by the user who created them.
         **kwargs
             Parameters to pass to `httpx.request`.

luna_sdk/repositories/optimization_repo.py

@@ -9,7 +9,7 @@ from luna_sdk.interfaces.optimization_repo_i import IOptimizationRepo
 from luna_sdk.schemas import UseCase
 from luna_sdk.schemas.create import QUBOIn
 from luna_sdk.schemas.create.optimization import OptimizationUseCaseIn
-from luna_sdk.schemas.enums.optimization import InputType
+from luna_sdk.schemas.enums.optimization import OptFormat
 from luna_sdk.schemas.enums.timeframe import TimeframeEnum
 from luna_sdk.schemas.optimization import (
     Optimization,
@@ -17,6 +17,7 @@ from luna_sdk.schemas.optimization import (
     OptimizationCQM,
     OptimizationLP,
     OptimizationUseCase,
+    OptimizationQubo,
 )
 from luna_sdk.schemas.optimization_formats.bqm import BQMSchema
 from luna_sdk.schemas.optimization_formats.cqm import CQMSchema
@@ -30,7 +31,7 @@ class OptimizationRepo(IOptimizationRepo):
     def get_all(
         self,
         timeframe: Optional[TimeframeEnum] = None,
-        input_type: Optional[InputType] = None,
+        input_type: Optional[OptFormat] = None,
         limit: int = 50,
         offset: int = 0,
         **kwargs,
@@ -40,7 +41,7 @@ class OptimizationRepo(IOptimizationRepo):
             params["timeframe"] = timeframe.value
 
         if input_type:
-            params["input_type"] = input_type.value
+            params["original_format"] = input_type.value
 
         if limit < 1:
             # set the minimum limit to 1
@@ -63,21 +64,21 @@ class OptimizationRepo(IOptimizationRepo):
 
         optimization_data = response_data.pop("optimization_data", None)
         if optimization_data:
-            input_type = response_data["input_type"]
+            original_format = response_data["original_format"]
 
-            if input_type in (InputType.bqm_spin, InputType.bqm_binary):
+            if original_format == OptFormat.BQM:
                 model = OptimizationBQM
-            elif input_type == InputType.cqm:
+            elif original_format == OptFormat.CQM:
                 model = OptimizationCQM
-            elif input_type == InputType.lp:
+            elif original_format == OptFormat.LP:
                 model = OptimizationLP
-            elif input_type == InputType.qubo:
+            elif original_format == OptFormat.QUBO:
                 if response_data.get("use_case_name"):
                     model = OptimizationUseCase
                 else:
-                    model = OptimizationBQM
+                    model = OptimizationQubo
             else:
-                model = OptimizationBQM
+                raise ValueError("Unknown optimization format")
 
             response_data.update(optimization_data)
 

luna_sdk/repositories/qpu_token_repo.py

@@ -22,15 +22,15 @@ class QpuTokenRepo(IQpuTokenRepo):
         if token_type is None:
             return f"{self._endpoint}"
         elif token_type == QpuTokenTypeEnum.PERSONAL:
-            return f"{self._endpoint}/users"
+            return f"{self._endpoint}/private"
         else:
-            return f"{self._endpoint}/organization"
+            return f"{self._endpoint}/shared"
 
     def _get_by_name(
         self, name: str, token_type: QpuTokenTypeEnum, **kwargs
     ) -> QpuTokenOut:
         response: Response = self._client.get(
-            f"{self._get_endpoint_by_type(token_type)}/by_name/{name}", **kwargs
+            f"{self._get_endpoint_by_type(token_type)}/{name}", **kwargs
         )
         response.raise_for_status()
 
@@ -72,6 +72,8 @@ class QpuTokenRepo(IQpuTokenRepo):
         filter_provider: Optional[str] = None,
         name: Optional[str] = None,
         token_type: Optional[QpuTokenTypeEnum] = None,
+        limit: Optional[int] = None,
+        offset: Optional[int] = None,
         **kwargs,
     ) -> Dict[QpuTokenTypeEnum, List[QpuTokenOut]]:
         params = {}
@@ -80,20 +82,36 @@ class QpuTokenRepo(IQpuTokenRepo):
 
         if name:
             params["name"] = name
-
-        response = self._client.get(
-            self._get_endpoint_by_type(), params=params, **kwargs
-        )
-        response.raise_for_status()
+        if limit is not None:
+            params["limit"] = str(limit)
+        if offset is not None:
+            params["offset"] = str(offset)
 
         to_return: Dict[QpuTokenTypeEnum, List[QpuTokenOut]] = {}
-        for key, value in response.json().items():
-            tokens = []
-            for item in value:
-                if token_type is None or token_type.value == key:
-                    item["token_type"] = QpuTokenTypeEnum(key)
-                    tokens.append(QpuTokenOut.model_validate(item))
-            to_return[QpuTokenTypeEnum(key)] = tokens
+        if token_type is None or token_type == QpuTokenTypeEnum.PERSONAL:
+            response = self._client.get(
+                self._get_endpoint_by_type(QpuTokenTypeEnum.PERSONAL),
+                params=params,
+                **kwargs,
+            )
+            response.raise_for_status()
+            personal_qpu_tokens = response.json()
+            to_return[QpuTokenTypeEnum.PERSONAL] = [
+                QpuTokenOut(**qpu_token, token_type=QpuTokenTypeEnum.PERSONAL)
+                for qpu_token in personal_qpu_tokens
+            ]
+        if token_type is None or token_type == QpuTokenTypeEnum.GROUP:
+            response = self._client.get(
+                self._get_endpoint_by_type(QpuTokenTypeEnum.GROUP),
+                params=params,
+                **kwargs,
+            )
+            response.raise_for_status()
+            shared_qpu_tokens = response.json()
+            to_return[QpuTokenTypeEnum.GROUP] = [
+                QpuTokenOut(**qpu_token, token_type=QpuTokenTypeEnum.GROUP)
+                for qpu_token in shared_qpu_tokens
+            ]
 
         return to_return
 
@@ -114,8 +132,8 @@ class QpuTokenRepo(IQpuTokenRepo):
 
         token: QpuTokenOut = self.get(name, token_type)
 
-        response = self._client.put(
-            f"{self._get_endpoint_by_type(token_type)}/{token.id}",
+        response = self._client.patch(
+            f"{self._get_endpoint_by_type(token_type)}/{token.name}",
             content=json.dumps(qpu_token_update_data),
             **kwargs,
         )
@@ -126,9 +144,7 @@ class QpuTokenRepo(IQpuTokenRepo):
         return QpuTokenOut.model_validate(qpu_token_data)
 
     def delete(self, name: str, token_type: QpuTokenTypeEnum, **kwargs) -> None:
-        token: QpuTokenOut = self.get(name, token_type)
-
         response = self._client.delete(
-            f"{self._get_endpoint_by_type(token_type)}/{token.id}", **kwargs
+            f"{self._get_endpoint_by_type(token_type)}/{name}", **kwargs
         )
         response.raise_for_status()

luna_sdk/schemas/enums/optimization.py

@@ -1,10 +1,11 @@
 from enum import Enum
 
 
-class InputType(str, Enum):
-    bqm_spin = "bqm_spin"
-    bqm_binary = "bqm_binary"
-    cqm = "cqm"
-    lp = "lp"
-    aq = "aq"
-    qubo = "qubo"
+class OptFormat(str, Enum):
+    """Enumeration of all supported formats."""
+
+    AQ_MODEL = "AQ_MODEL"
+    LP = "LP"
+    QUBO = "QUBO_MATRIX"
+    CQM = "CQM"
+    BQM = "BQM"

luna_sdk/schemas/enums/qpu_token_type.py

@@ -2,5 +2,5 @@ from enum import Enum
 
 
 class QpuTokenTypeEnum(str, Enum):
-    ORGANIZATION = "organization"
+    GROUP = "group"
     PERSONAL = "personal"

luna_sdk/schemas/optimization.py

@@ -1,11 +1,12 @@
-from typing import Any, Dict, Generic, List, Optional, TypeVar
+from typing import Any, Dict, Generic, Optional, TypeVar
 
 from pydantic import BaseModel, ConfigDict
 
-from luna_sdk.schemas.enums.optimization import InputType
+from luna_sdk.schemas.enums.optimization import OptFormat
 from luna_sdk.schemas.optimization_formats.bqm import BQMSchema
 from luna_sdk.schemas.optimization_formats.cqm import CQMSchema
 from luna_sdk.schemas.optimization_formats.lp import LPSchema
+from luna_sdk.schemas.optimization_formats.qubo import QuboSchema
 from luna_sdk.schemas.pretty_base import PrettyBase
 from luna_sdk.schemas.wrappers import PydanticDatetimeWrapper
 
@@ -33,24 +34,13 @@ class Optimization(PrettyBase):
     created_by: str
     modified_date: Optional[PydanticDatetimeWrapper] = None
     modified_by: Optional[str] = None
-    input_type: Optional[InputType] = None
+    original_format: Optional[OptFormat] = None
     use_case_name: Optional[str] = None
     params: Optional[Dict[str, Any]] = None
 
     model_config = ConfigDict(extra="ignore", from_attributes=False)
 
 
-class OptimizationQubo(BaseModel):
-    id: str
-    name: Optional[str] = None
-    created_date: PydanticDatetimeWrapper
-    created_by: str
-    modified_date: Optional[PydanticDatetimeWrapper] = None
-    modified_by: Optional[str] = None
-
-    matrix: List[List[float]]
-
-
 class OptimizationBQM(Optimization, BQMSchema): ...
 
 
@@ -60,10 +50,13 @@ class OptimizationCQM(Optimization, CQMSchema): ...
 class OptimizationLP(Optimization, LPSchema): ...
 
 
-class OptimizationUseCase(Optimization, BQMSchema):
+class OptimizationUseCase(Optimization, QuboSchema):
     use_case: Dict[str, Any]
 
 
+class OptimizationQubo(Optimization, QuboSchema): ...
+
+
 T = TypeVar("T")
 
 

luna_sdk/schemas/optimization_formats/qubo.py

@@ -0,0 +1,8 @@
+from typing import List
+
+from pydantic import BaseModel
+
+
+class QuboSchema(BaseModel):
+    matrix: List[List[float]]
+    offset: float

luna_sdk/schemas/qpu_token.py

@@ -12,7 +12,7 @@ class QpuTokenSource(str, Enum):
     # stored token in user account
     PERSONAL = "personal"
     # stored token in group account
-    ORGANIZATION = "organization"
+    GROUP = "group"
 
 
 class QpuToken(BaseModel):
@@ -44,16 +44,12 @@ class QpuTokenOut(BaseModel):
 
     Attributes
     ----------
-    id: str
-        Id of the QPU token
     name: Optional[str]
         Name of the QPU token
     provider: ProviderEnum
         Name of provider: dwave | ibm
     """
 
-    id: str
-
     name: str
     provider: str
     token_type: QpuTokenTypeEnum

luna_sdk/schemas/rest/qpu_token/qpu_token_source.py

@@ -0,0 +1,18 @@
+from enum import Enum
+
+
+class _RESTQpuTokenSource(str, Enum):
+    """
+    This schema allow us not to change entire backend,
+    but just sync SDK and everything else in terms of qpu token source.
+    Currently, the difference is that
+    SDK has group qpu token source
+    and backend has organization qpu token source which are mapped to each other.
+    """
+
+    # token currently passed in from the API call (not stored by us)
+    INLINE = "inline"
+    # stored token in user account
+    PERSONAL = "personal"
+    # stored token in group account
+    ORGANIZATION = "organization"

luna_sdk/schemas/rest/qpu_token/token_provider.py

@@ -1,20 +1,48 @@
-from typing import Optional
+from typing import Optional, Union
 
 from pydantic import BaseModel, Extra
 
-from luna_sdk.schemas import QpuToken, TokenProvider
+from luna_sdk.schemas import QpuToken, TokenProvider, QpuTokenSource
+from luna_sdk.schemas.rest.qpu_token.qpu_token_source import _RESTQpuTokenSource
+
+
+class _RestQpuToken(BaseModel):
+    source: _RESTQpuTokenSource
+    # A unique name for a stored token
+    name: Optional[str] = None
+    # This could be a QPU token, an API key or any token key for a QPU provider.
+    # If the token is not passed from this API call, one stored in the user's
+    # account will be used.
+    token: Optional[str] = None
+
+    @classmethod
+    def from_qpu_token(cls, qpu_token: Optional[QpuToken]) -> Optional["_RestQpuToken"]:
+        if qpu_token is None:
+            return None
+        # Organizational tokens were renamed to group in #1851
+        # For smoother transition we only change naming in the SDK,
+        # and therefore we need a mapping between Group and Organization here.
+        # However, in backend for now QPU tokens still has source organization
+        # TODO: Remove it when backend I/O schema is changed
+        if qpu_token.source == QpuTokenSource.GROUP:
+            return cls(
+                source=_RESTQpuTokenSource.ORGANIZATION,
+                name=qpu_token.name,
+                token=qpu_token.token,
+            )
+        return cls.model_validate(qpu_token, from_attributes=True)
 
 
 class AWSQpuTokens(BaseModel):
-    aws_access_key: QpuToken
-    aws_secret_access_key: QpuToken
+    aws_access_key: _RestQpuToken
+    aws_secret_access_key: _RestQpuToken
 
 
 class RestAPITokenProvider(BaseModel):
-    dwave: Optional[QpuToken] = None
-    ibm: Optional[QpuToken] = None
-    fujitsu: Optional[QpuToken] = None
-    qctrl: Optional[QpuToken] = None
+    dwave: Optional[_RestQpuToken] = None
+    ibm: Optional[_RestQpuToken] = None
+    fujitsu: Optional[_RestQpuToken] = None
+    qctrl: Optional[_RestQpuToken] = None
     aws: Optional[AWSQpuTokens] = None
 
     @classmethod
@@ -28,16 +56,20 @@ class RestAPITokenProvider(BaseModel):
         ):
             # Ignoring mypy here to receive validation error, because we always need 2 tokens for aws
             aws = AWSQpuTokens(
-                aws_access_key=getattr(token_provider, "aws_access_key", None),  # type: ignore[arg-type]
-                aws_secret_access_key=getattr(  # type: ignore[arg-type]
-                    token_provider, "aws_secret_access_key", None
+                aws_access_key=_RestQpuToken.from_qpu_token(
+                    getattr(token_provider, "aws_access_key", None)
+                ),  # type: ignore[arg-type]
+                aws_secret_access_key=_RestQpuToken.from_qpu_token(
+                    getattr(  # type: ignore[arg-type]
+                        token_provider, "aws_secret_access_key", None
+                    )
                 ),
             )
         return cls(
-            dwave=token_provider.dwave,
-            ibm=token_provider.ibm,
-            fujitsu=token_provider.fujitsu,
-            qctrl=token_provider.qctrl,
+            dwave=_RestQpuToken.from_qpu_token(token_provider.dwave),
+            ibm=_RestQpuToken.from_qpu_token(token_provider.ibm),
+            fujitsu=_RestQpuToken.from_qpu_token(token_provider.fujitsu),
+            qctrl=_RestQpuToken.from_qpu_token(token_provider.qctrl),
             aws=aws,
         )
 

luna_sdk/utils/qpu_tokens.py

@@ -1,9 +1,10 @@
 import os
 
-from luna_sdk.schemas import QpuToken, QpuTokenSource
+from luna_sdk.schemas.rest.qpu_token.qpu_token_source import _RESTQpuTokenSource
 from luna_sdk.schemas.rest.qpu_token.token_provider import (
     RestAPITokenProvider,
     AWSQpuTokens,
+    _RestQpuToken,
 )
 
 
@@ -15,37 +16,37 @@ def extract_qpu_tokens_from_env() -> RestAPITokenProvider:
     aws_access_key = os.environ.get("LUNA_AWS_ACCESS_KEY")
     aws_access_secret_key = os.environ.get("LUNA_AWS_SECRET_ACCESS_KEY")
     return RestAPITokenProvider(
-        ibm=QpuToken(
-            source=QpuTokenSource.INLINE,
+        ibm=_RestQpuToken(
+            source=_RESTQpuTokenSource.INLINE,
             token=ibm_token,
         )
         if ibm_token
         else None,
-        dwave=QpuToken(
-            source=QpuTokenSource.INLINE,
+        dwave=_RestQpuToken(
+            source=_RESTQpuTokenSource.INLINE,
             token=dwave_token,
         )
         if dwave_token
         else None,
-        qctrl=QpuToken(
-            source=QpuTokenSource.INLINE,
+        qctrl=_RestQpuToken(
+            source=_RESTQpuTokenSource.INLINE,
             token=qctrl_token,
         )
         if qctrl_token
         else None,
-        fujitsu=QpuToken(
-            source=QpuTokenSource.INLINE,
+        fujitsu=_RestQpuToken(
+            source=_RESTQpuTokenSource.INLINE,
             token=fujitsu_token,
         )
         if fujitsu_token
         else None,
         aws=AWSQpuTokens(
-            aws_access_key=QpuToken(
-                source=QpuTokenSource.INLINE,
+            aws_access_key=_RestQpuToken(
+                source=_RESTQpuTokenSource.INLINE,
                 token=aws_access_key,
             ),
-            aws_secret_access_key=QpuToken(
-                source=QpuTokenSource.INLINE,
+            aws_secret_access_key=_RestQpuToken(
+                source=_RESTQpuTokenSource.INLINE,
                 token=aws_access_secret_key,
             ),
         ),

luna_sdk/controllers/custom_login_client.py

@@ -1,66 +0,0 @@
-import logging
-from http.client import UNAUTHORIZED
-from importlib.metadata import version
-
-from httpx import Client, ReadTimeout, Response
-
-from luna_sdk.error.http_error_utils import HttpErrorUtils
-from luna_sdk.exceptions.timeout_exception import TimeoutException
-
-
-class CustomLoginClient(Client):
-    _login_url: str
-    _email: str
-    _password: str
-    _bearer_token: str
-
-    _version: str = version("luna-quantum")
-
-    _user_agent: str = f"LunaSDK/{_version}"
-
-    def __init__(self, email: str, password: str, login_url: str, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self._email = email
-        self._password = password
-        self._login_url = login_url
-
-        self.headers["User-Agent"] = self._user_agent
-
-    def login(self, email: str, password: str):
-        with Client() as client:
-            headers = {
-                "accept": "application/json",
-                "Content-Type": "application/x-www-form-urlencoded",
-                "User-Agent": self._user_agent,
-            }
-
-            response: Response = client.post(
-                self._login_url,
-                data={"username": email, "password": password},
-                headers=headers,
-                # Ensure timeout is high enough. CustomLoginClient will be deleted in
-                # near future anyway.
-                timeout=None,
-            )
-            HttpErrorUtils.check_for_error(response)
-
-            self._bearer_token = response.json()["access_token"]
-
-    def request(self, *args, **kwargs) -> Response:
-        try:
-            response: Response = super().request(*args, **kwargs)
-            if response.status_code == UNAUTHORIZED:
-                logging.info("Unauthorized - trying to login")
-
-                self.login(self._email, self._password)
-
-                logging.info("Re-login successful")
-                self.headers.update(
-                    headers={"authorization": f"Bearer {self._bearer_token}"}
-                )
-                logging.info("Trying request again")
-                response = super().request(*args, **kwargs)
-        except ReadTimeout:
-            raise TimeoutException()
-        HttpErrorUtils.check_for_error(response)
-        return response