fxn 0.0.32__py3-none-any.whl → 0.0.34__py3-none-any.whl

fxn/graph/client.py

@@ -32,14 +32,12 @@ class GraphClient:
             json={ "query": query, "variables": variables },
             headers={ "Authorization": f"Bearer {self.access_key}" } if self.access_key else { }
         )
-        # Check
         payload = response.json()
+        # Check error
         try:
             response.raise_for_status()
-        except:
-            raise RuntimeError(payload.get("error"))
-        # Check error
-        if "errors" in payload:
-            raise RuntimeError(payload["errors"][0]["message"])
+        except Exception as ex:
+            error = payload["errors"][0]["message"] if "errors" in payload else str(ex)
+            raise RuntimeError(error)
         # Return
         return payload["data"]

fxn/services/prediction/service.py

@@ -44,7 +44,9 @@ class PredictionService:
         inputs: Dict[str, Union[ndarray, str, float, int, bool, List, Dict[str, Any], Path, Image.Image, Value]] = None,
         raw_outputs: bool=False,
         return_binary_path: bool=True,
-        data_url_limit: int=None
+        data_url_limit: int=None,
+        client_id: str=None,
+        configuration_id: str=None
     ) -> Prediction:
         """
         Create a prediction.
@@ -55,6 +57,8 @@ class PredictionService:
             raw_outputs (bool): Skip converting output values into Pythonic types. This only applies to `CLOUD` predictions.
             return_binary_path (bool): Write binary values to file and return a `Path` instead of returning `BytesIO` instance.
             data_url_limit (int): Return a data URL if a given output value is smaller than this size in bytes. This only applies to `CLOUD` predictions.
+            client_id (str): Function client identifier. Specify this to override the current client identifier.
+            configuration_id (str): Configuration identifier. Specify this to override the current client configuration identifier.
 
         Returns:
             Prediction: Created prediction.
@@ -66,13 +70,13 @@ class PredictionService:
         key = uuid4().hex
         values = { name: self.to_value(value, name, key=key).model_dump(mode="json") for name, value in inputs.items() } if inputs is not None else { }
         # Query
-        response = post( # INCOMPLETE # Configuration token
+        response = post(
             f"{self.client.api_url}/predict/{tag}?rawOutputs=true&dataUrlLimit={data_url_limit}",
             json=values,
             headers={
                 "Authorization": f"Bearer {self.client.access_key}",
-                "fxn-client": self.__get_client_id(),
-                "fxn-configuration-token": self.__get_configuration_token()
+                "fxn-client": client_id if client_id is not None else self.__get_client_id(),
+                "fxn-configuration-token": configuration_id if configuration_id is not None else self.__get_configuration_id()
             }
         )
         # Check
@@ -84,12 +88,14 @@ class PredictionService:
             raise RuntimeError(error)
         # Parse prediction
         prediction = self.__parse_prediction(prediction, raw_outputs=raw_outputs, return_binary_path=return_binary_path)
+        # Check edge prediction
+        if prediction.type != PredictorType.Edge or raw_outputs:
+            return prediction
+        # Load edge predictor
+        predictor = self.__load(prediction)
+        self.__cache[tag] = predictor
         # Create edge prediction
-        if prediction.type == PredictorType.Edge:
-            predictor = self.__load(prediction)
-            self.__cache[tag] = predictor
-            prediction = self.__predict(tag=tag, predictor=predictor, inputs=inputs) if inputs is not None else prediction
-        # Return
+        prediction = self.__predict(tag=tag, predictor=predictor, inputs=inputs) if inputs is not None else prediction
         return prediction
     
     async def stream (
@@ -100,6 +106,8 @@ class PredictionService:
         raw_outputs: bool=False,
         return_binary_path: bool=True,
         data_url_limit: int=None,
+        client_id: str=None,
+        configuration_id: str=None
     ) -> AsyncIterator[Prediction]:
         """
         Create a streaming prediction.
@@ -112,6 +120,8 @@ class PredictionService:
             raw_outputs (bool): Skip converting output values into Pythonic types. This only applies to `CLOUD` predictions.
             return_binary_path (bool): Write binary values to file and return a `Path` instead of returning `BytesIO` instance.
             data_url_limit (int): Return a data URL if a given output value is smaller than this size in bytes. This only applies to `CLOUD` predictions.
+            client_id (str): Function client identifier. Specify this to override the current client identifier.
+            configuration_id (str): Configuration identifier. Specify this to override the current client configuration identifier.
 
         Returns:
             Prediction: Created prediction.
@@ -122,14 +132,14 @@ class PredictionService:
             return
         # Serialize inputs
         key = uuid4().hex
-        values = { name: self.to_value(value, name, key=key).model_dump(mode="json") for name, value in inputs.items() } # INCOMPLETE # values
+        values = { name: self.to_value(value, name, key=key).model_dump(mode="json") for name, value in inputs.items() }
         # Request
         url = f"{self.client.api_url}/predict/{tag}?stream=true&rawOutputs=true&dataUrlLimit={data_url_limit}"
         headers = {
             "Content-Type": "application/json",
             "Authorization": f"Bearer {self.client.access_key}",
-            "fxn-client": self.__get_client_id(),
-            "fxn-configuration-token": self.__get_configuration_token()
+            "fxn-client": client_id if client_id is not None else self.__get_client_id(),
+            "fxn-configuration-token": configuration_id if configuration_id is not None else self.__get_configuration_id()
         }
         async with ClientSession(headers=headers) as session:
             async with session.post(url, data=dumps(values)) as response:
@@ -143,12 +153,15 @@ class PredictionService:
                         raise RuntimeError(error)
                     # Parse prediction
                     prediction = self.__parse_prediction(prediction, raw_outputs=raw_outputs, return_binary_path=return_binary_path)
-                    # Create edge prediction
-                    if prediction.type == PredictorType.Edge:
-                        predictor = self.__load(prediction)
-                        self.__cache[tag] = predictor
-                        prediction = self.__predict(tag=tag, predictor=predictor, inputs=inputs) if inputs is not None else prediction
-                    # Yield
+                    # Check edge prediction
+                    if prediction.type != PredictorType.Edge or raw_outputs:
+                        yield prediction
+                        continue
+                    # Load edge predictor
+                    predictor = self.__load(prediction)
+                    self.__cache[tag] = predictor
+                    # Create prediction
+                    prediction = self.__predict(tag=tag, predictor=predictor, inputs=inputs) if inputs is not None else prediction
                     yield prediction
 
     def to_object (
@@ -303,14 +316,14 @@ class PredictionService:
             return f"windows:{machine()}"
         raise RuntimeError(f"Function cannot make predictions on the {id} platform")
 
-    def __get_configuration_token (self) -> Optional[str]:
+    def __get_configuration_id (self) -> Optional[str]:
         # Check
         if not self.__fxnc:
             return None
         # Get
         buffer = create_string_buffer(2048)
         status = self.__fxnc.FXNConfigurationGetUniqueID(buffer, len(buffer))
-        assert status.value == FXNStatus.OK, f"Failed to create prediction configuration token with status: {status.value}"
+        assert status.value == FXNStatus.OK, f"Failed to create prediction configuration identifier with status: {status.value}"
         uid = buffer.value.decode("utf-8")
         # Return
         return uid

fxn/services/predictor.py

@@ -28,7 +28,7 @@ class PredictorService:
             Predictor: Predictor.
         """
         # Query
-        response = self.client.queryfxn(f"""
+        response = self.client.query(f"""
             query ($input: PredictorInput!) {{
                 predictor (input: $input) {{
                     {PREDICTOR_FIELDS}

fxn/version.py

@@ -3,4 +3,4 @@
 #   Copyright © 2024 NatML Inc. All Rights Reserved.
 #
 
-__version__ = "0.0.32"
+__version__ = "0.0.34"

{fxn-0.0.32.dist-info → fxn-0.0.34.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fxn
-Version: 0.0.32
+Version: 0.0.34
 Summary: Run on-device and cloud AI prediction functions in Python. Register at https://fxn.ai.
 Author-email: "NatML Inc." <hi@fxn.ai>
 License: Apache License

{fxn-0.0.32.dist-info → fxn-0.0.34.dist-info}/RECORD

@@ -1,7 +1,7 @@
 fxn/__init__.py,sha256=tWk0-aCNHX_yCS-Dg90pYnniNka9MWFoNMk6xY7u4nI,157
 fxn/function.py,sha256=H2oviHGWfal2O7d386R8BZDMUZYdfOuMB7OijiPKo54,1632
 fxn/magic.py,sha256=PQmXhO9EvJ5EZylioV-6gsCvqhVRYscKBSOBoN4VhTk,1041
-fxn/version.py,sha256=epyRJT-bUasofDr6lGpbGby_jjgup6OgteaA8u1cUaQ,95
+fxn/version.py,sha256=dDB8U8vJA_k2rzwbLOd_LdkqkLdWLH3ol5jiNfrM-zQ,95
 fxn/cli/__init__.py,sha256=gwMG0euV0qCe_vSvJLqBd6VWoQ99T-y4xQXeA4m4Wf0,1492
 fxn/cli/auth.py,sha256=MpHxhqPjGY92TmaTh3o58i868Cv-6Xgf13Si1NFluMg,1677
 fxn/cli/env.py,sha256=shqoP4tUiXdOoil73oiUYpqGeVcR119HPYFKgnoF894,1553
@@ -9,21 +9,21 @@ fxn/cli/misc.py,sha256=J3WgNjrxRzm-_iKC3Cp0o4VHeBYBQ1ta_t2-ozD9roo,662
 fxn/cli/predict.py,sha256=Q6oni_YScpBKRM1CuLK5jDAOORSfTcY6NLS5lC4a3jA,3259
 fxn/cli/predictors.py,sha256=Fg1yFvPgVnLORnQ3K_EWnGYw_lpkjTOA2l4W2wbXr08,4310
 fxn/graph/__init__.py,sha256=rJIDBhYg5jcrWO4hT4-CpwPq6dSgmLTEHCfUYTLpVaI,103
-fxn/graph/client.py,sha256=TRTgPatHq0nn-IkarBF93jEJ9-xltq-V9JJFIfHvqY4,1215
+fxn/graph/client.py,sha256=WCNsebcuwIlP9W5k_8AQCpxOCcy7cpbengfu2rIkGmc,1192
 fxn/libs/__init__.py,sha256=c_q01PLV3Mi-qV0_HVbNRHOI2TIUr_cDIJHvCASsYZk,71
 fxn/libs/linux/__init__.py,sha256=c_q01PLV3Mi-qV0_HVbNRHOI2TIUr_cDIJHvCASsYZk,71
-fxn/libs/macos/Function.dylib,sha256=rXtIrntsqg1SbrQq8Qm567hRpfM07ZxxGgnpYh35JJ8,545792
+fxn/libs/macos/Function.dylib,sha256=RLI17yfKPZqIeItXAnijg87mYGrgK5EvdccVKh23I6E,562176
 fxn/libs/macos/__init__.py,sha256=c_q01PLV3Mi-qV0_HVbNRHOI2TIUr_cDIJHvCASsYZk,71
-fxn/libs/windows/Function.dll,sha256=Z5Z4snwJbByiHBo5amUAb9OUaEzNUe6meK-07brJbQQ,424960
+fxn/libs/windows/Function.dll,sha256=rYXuzHUjoHpNqDvyVkLPdjot1ID9-MUqBP_CKATCMxw,426496
 fxn/libs/windows/__init__.py,sha256=c_q01PLV3Mi-qV0_HVbNRHOI2TIUr_cDIJHvCASsYZk,71
 fxn/services/__init__.py,sha256=OTBRL_wH94hc_scZgRd42VrJQfldNLjv4APN4YaWBAw,366
 fxn/services/environment.py,sha256=-K84dJhlQ_R13CPCqBMngdxSPP2jsgtNc_wBYx6dxjU,3716
-fxn/services/predictor.py,sha256=KtzckP0xsy6uoGATww4AbBQbEC9s2W6MDNrJFJx7rA8,7880
+fxn/services/predictor.py,sha256=2thCKP6N6e7T-nXMoWPoDGGkYV2h4_BxrhXeHJoBP5M,7877
 fxn/services/storage.py,sha256=MY4in8XXVHDIpp8f928PFdujwegESb6m1zzop6d-z58,5517
 fxn/services/user.py,sha256=z7mencF-muknruaUuoleu6JoL-QsPJcrJ6ONT_6U7fk,1219
 fxn/services/prediction/__init__.py,sha256=TPox_z58SRjIvziCt1UnLNN1O23n_iF6HcmI0p9hwpQ,129
 fxn/services/prediction/fxnc.py,sha256=VIqEBCWl725NhuPek3t6GLOSWfva_faLxGOIDyKwa8A,12739
-fxn/services/prediction/service.py,sha256=K2IaKZgX-vlt81wNxGbElTbc5X1j2KnD3OwLRt90qCI,22188
+fxn/services/prediction/service.py,sha256=s0ztU5bA6dY1ya5vgUiOnVz2z31UUjc4OvdawC0TijU,23142
 fxn/types/__init__.py,sha256=jHLpQnvUKGQujVPK3li1rIkANBBvw6l_EznzIsfoD88,438
 fxn/types/dtype.py,sha256=YpTnIG-yzrQwda27GzfGZcel-zF3gOMMoHhcWD915BY,617
 fxn/types/environment.py,sha256=FbmfGjSb5yYMT9IyDj8zNUpsoP3RbzqM6tK8gn2TfDs,394
@@ -34,9 +34,9 @@ fxn/types/storage.py,sha256=AtVKR3CtHzvSWLiJS_bbUyIA2Of_IKZVeL5_1PqqrQ0,228
 fxn/types/tag.py,sha256=hWzSDCo8VjRHjS5ZLuFi3xVo8cuCNaNeULQ2mHEuwzM,707
 fxn/types/user.py,sha256=_hc1YQh0WydniAurywA70EDs4VCY5rnGRYSiRc97Ab0,150
 fxn/types/value.py,sha256=_Euyb3ffydKV1Q68Mf2G9mz7gKD5NzFap-aX1NEuNuY,767
-fxn-0.0.32.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-fxn-0.0.32.dist-info/METADATA,sha256=gOIoOT0leYXGe0w3C0IIi_v-fvj4DC8On_7b_5H4aHY,16309
-fxn-0.0.32.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-fxn-0.0.32.dist-info/entry_points.txt,sha256=O_AwD5dYaeB-YT1F9hPAPuDYCkw_W0tdNGYbc5RVR2k,45
-fxn-0.0.32.dist-info/top_level.txt,sha256=1ULIEGrnMlhId8nYAkjmRn9g3KEFuHKboq193SEKQkA,4
-fxn-0.0.32.dist-info/RECORD,,
+fxn-0.0.34.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+fxn-0.0.34.dist-info/METADATA,sha256=FThpoXq7uHtOeEDBbe3jFx3k7r7wlweunFGW-C0MciY,16309
+fxn-0.0.34.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+fxn-0.0.34.dist-info/entry_points.txt,sha256=O_AwD5dYaeB-YT1F9hPAPuDYCkw_W0tdNGYbc5RVR2k,45
+fxn-0.0.34.dist-info/top_level.txt,sha256=1ULIEGrnMlhId8nYAkjmRn9g3KEFuHKboq193SEKQkA,4
+fxn-0.0.34.dist-info/RECORD,,