fxn 0.0.32__tar.gz → 0.0.33__tar.gz

{fxn-0.0.32 → fxn-0.0.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fxn
-Version: 0.0.32
+Version: 0.0.33
 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 → fxn-0.0.33}/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-0.0.32 → fxn-0.0.33}/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,14 @@ 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:
+                        return prediction
+                    # 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 +315,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-0.0.32 → fxn-0.0.33}/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-0.0.32 → fxn-0.0.33}/fxn/version.py

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

{fxn-0.0.32 → fxn-0.0.33}/fxn.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fxn
-Version: 0.0.32
+Version: 0.0.33
 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