fxn 0.0.36__py3-none-any.whl → 0.0.37__py3-none-any.whl

fxn/cli/misc.py

@@ -9,18 +9,24 @@ from webbrowser import open as open_browser
 
 from ..version import __version__
 
-def _learn_callback (value: bool):
+def _explore (value: bool):
+    if value:
+        open_browser("https://fxn.ai/explore")
+        raise Exit()
+
+def _learn (value: bool):
     if value:
         open_browser("https://docs.fxn.ai")
         raise Exit()
 
-def _version_callback (value: bool):
+def _version (value: bool):
     if value:
         print(__version__)
         raise Exit()
 
 def cli_options (
-    learn: bool = Option(None, "--learn", callback=_learn_callback, help="Learn about Function."),
-    version: bool = Option(None, "--version", callback=_version_callback, help="Get the Function CLI version.")
+    explore: bool = Option(None, "--explore", callback=_explore, help="Explore predictors on Function."),
+    learn: bool = Option(None, "--learn", callback=_learn, help="Learn about Function."),
+    version: bool = Option(None, "--version", callback=_version, help="Get the Function CLI version.")
 ):
     pass

fxn/function.py

@@ -6,7 +6,7 @@
 from os import environ
 
 from .api import GraphClient
-from .services import EnvironmentVariableService, PredictionService, PredictorService, StorageService, UserService
+from .services import PredictionService, PredictorService, UserService
 
 class Function:
     """
@@ -26,16 +26,11 @@ class Function:
     users: UserService
     predictors: PredictorService
     predictions: PredictionService
-    #environment_variables: EnvironmentVariableService
-    #storage: StorageService
 
     def __init__ (self, access_key: str=None, api_url: str=None):
         access_key = access_key or environ.get("FXN_ACCESS_KEY", None)
         api_url = api_url or environ.get("FXN_API_URL", "https://api.fxn.ai")
-        client = GraphClient(access_key, api_url)
-        storage = StorageService(client)
-        self.client = client
-        self.users = UserService(client)
-        self.predictors = PredictorService(client, storage)
-        self.predictions = PredictionService(client)
-        #self.environment_variables = EnvironmentVariableService(self.client)
+        self.client = GraphClient(access_key, api_url)
+        self.users = UserService(self.client)
+        self.predictors = PredictorService(self.client)
+        self.predictions = PredictionService(self.client)

fxn/services/__init__.py

@@ -5,6 +5,4 @@
 
 from .user import UserService, PROFILE_FIELDS, USER_FIELDS
 from .predictor import PredictorService, PREDICTOR_FIELDS
-from .prediction import PredictionService, PREDICTION_FIELDS
-from .environment import EnvironmentVariableService, ENVIRONMENT_VARIABLE_FIELDS
-from .storage import StorageService
+from .prediction import PredictionService, PREDICTION_FIELDS

fxn/services/predictor.py

@@ -7,14 +7,12 @@ from typing import List
 
 from ..api import GraphClient
 from ..types import Predictor, PredictorStatus
-from .storage import StorageService
 from .user import PROFILE_FIELDS
 
 class PredictorService:
 
-    def __init__ (self, client: GraphClient, storage: StorageService) -> None:
+    def __init__ (self, client: GraphClient) -> None:
         self.client = client
-        self.storage = storage
 
     def retrieve (self, tag: str) -> Predictor:
         """

fxn/version.py

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

{fxn-0.0.36.dist-info → fxn-0.0.37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fxn
-Version: 0.0.36
+Version: 0.0.37
 Summary: Run prediction functions locally in Python. Register at https://fxn.ai.
 Author-email: "NatML Inc." <hi@fxn.ai>
 License: Apache License

{fxn-0.0.36.dist-info → fxn-0.0.37.dist-info}/RECORD

@@ -1,7 +1,6 @@
 fxn/__init__.py,sha256=tWk0-aCNHX_yCS-Dg90pYnniNka9MWFoNMk6xY7u4nI,157
-fxn/function.py,sha256=NBEH37NX6GFj6pf3nBja8xeYb1IoKCPiE4Sxwpwj-mM,1452
-fxn/magic.py,sha256=PQmXhO9EvJ5EZylioV-6gsCvqhVRYscKBSOBoN4VhTk,1041
-fxn/version.py,sha256=BiY9-f6E3ZNjYc2X4h8op-HBbBeHAEepyx3H_ePXT58,95
+fxn/function.py,sha256=W_JkTk3KAMpFGqh95yO-Iy4AvFU22UJZkRt15dyf3IY,1187
+fxn/version.py,sha256=wjJZ4T4vd1dYpP5qvR3wfnAkWkgGYwz6yi2XeM2_KCY,95
 fxn/api/__init__.py,sha256=rJIDBhYg5jcrWO4hT4-CpwPq6dSgmLTEHCfUYTLpVaI,103
 fxn/api/client.py,sha256=WCNsebcuwIlP9W5k_8AQCpxOCcy7cpbengfu2rIkGmc,1192
 fxn/c/__init__.py,sha256=qBnS4_eoBe5biKoyhW0Fsfr3cqJ9SAvzmm-XB56ev0A,438
@@ -18,7 +17,7 @@ fxn/c/version.py,sha256=fnV14LTAXSl6Q03YFIWOINOUrs0DJpyBOcwP5VZvLFc,282
 fxn/cli/__init__.py,sha256=c9qBvRTHSWnO-8Ny431RlkZWznF7sShJfHYfjBazjRk,1481
 fxn/cli/auth.py,sha256=tMjgNA6AQeom3I5AsgPvWvN62cM3nFGBcjjXB7x4s8U,1688
 fxn/cli/env.py,sha256=shqoP4tUiXdOoil73oiUYpqGeVcR119HPYFKgnoF894,1553
-fxn/cli/misc.py,sha256=J3WgNjrxRzm-_iKC3Cp0o4VHeBYBQ1ta_t2-ozD9roo,662
+fxn/cli/misc.py,sha256=6zYuuF1pm1LzYkHG4YaSnBxzs7h8CReI6YLk1ysGRso,843
 fxn/cli/predict.py,sha256=hpd1VZtw1OBNkZwePCFtyTHLSDOzc8fuSODGmvmmG1E,3026
 fxn/cli/predictors.py,sha256=SSvxf5emr_upcU78vhdB2F9PM351YdP2a1bqf8FRaxE,2248
 fxn/lib/__init__.py,sha256=c_q01PLV3Mi-qV0_HVbNRHOI2TIUr_cDIJHvCASsYZk,71
@@ -26,11 +25,9 @@ fxn/lib/macos/arm64/Function.dylib,sha256=N-ewU2AXqgVAsYPpEnlWU09uyxLAywtsL0ous4
 fxn/lib/macos/x86_64/Function.dylib,sha256=DfoGF8v-lvxo8a10QUZ0egbfQZo6B6tNct5NMV1kpYc,269744
 fxn/lib/windows/arm64/Function.dll,sha256=kvixEsiKalAqMOyCRpcAcFgkXxK_9Vt-WDQgws5M6Xg,425472
 fxn/lib/windows/x86_64/Function.dll,sha256=lEHVER_6PQUqJHDd6YWMqZ2X6PLnJTmVa68cUgp5lJ8,450560
-fxn/services/__init__.py,sha256=OTBRL_wH94hc_scZgRd42VrJQfldNLjv4APN4YaWBAw,366
-fxn/services/environment.py,sha256=ITodddygFR9Kw8cdSh3vtTcTpUmUIsTFGpHnqx2RMVo,3714
+fxn/services/__init__.py,sha256=TZBB8xekhfA_Z1Jh68m_GScjXYsLGdx9MlCrjF9Ojsc,249
 fxn/services/prediction.py,sha256=EfjnwF_GEKSifClzsBWBuKe-NeSk9CeAMQAYDT0lF9A,20228
-fxn/services/predictor.py,sha256=yhrg5msrfVsIomPB1jlOa0z7jVGTDZIdvBnB-OYiQdk,5163
-fxn/services/storage.py,sha256=qGijBsfdGWQAumNAOYL6-SfSkrvYDuCK12FevdJl4cM,5480
+fxn/services/predictor.py,sha256=0FOrnGJo0Z0IqpY5exe7laHFXTbA6NXmWLeu8zioEJ0,5071
 fxn/services/user.py,sha256=niExZwZFl_hlgLTz9lvrU3QrVR8oKdMcm623wyQK-cA,1217
 fxn/types/__init__.py,sha256=GY7ST0Ue_sh4rB3a4MHkvql_Cn0p9qZ4wlf3luPOwk8,398
 fxn/types/dtype.py,sha256=YpTnIG-yzrQwda27GzfGZcel-zF3gOMMoHhcWD915BY,617
@@ -41,9 +38,9 @@ fxn/types/profile.py,sha256=1KWqPusKieCIcw4KSS2sScpwP0Z-mU4ThMYOZRxZ_68,1123
 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-0.0.36.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-fxn-0.0.36.dist-info/METADATA,sha256=Hk1xVRWsEy87RvJrvIFY9zSetdg_Ms5iTOfxYgh4Bho,16068
-fxn-0.0.36.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-fxn-0.0.36.dist-info/entry_points.txt,sha256=O_AwD5dYaeB-YT1F9hPAPuDYCkw_W0tdNGYbc5RVR2k,45
-fxn-0.0.36.dist-info/top_level.txt,sha256=1ULIEGrnMlhId8nYAkjmRn9g3KEFuHKboq193SEKQkA,4
-fxn-0.0.36.dist-info/RECORD,,
+fxn-0.0.37.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+fxn-0.0.37.dist-info/METADATA,sha256=3-Jhz_avkErQguXTzBGED3_slasVTUI2aH48tFrjl_Y,16068
+fxn-0.0.37.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+fxn-0.0.37.dist-info/entry_points.txt,sha256=O_AwD5dYaeB-YT1F9hPAPuDYCkw_W0tdNGYbc5RVR2k,45
+fxn-0.0.37.dist-info/top_level.txt,sha256=1ULIEGrnMlhId8nYAkjmRn9g3KEFuHKboq193SEKQkA,4
+fxn-0.0.37.dist-info/RECORD,,

fxn/magic.py

@@ -1,35 +0,0 @@
-# 
-#   Function
-#   Copyright © 2024 NatML Inc. All Rights Reserved.
-#
-
-from IPython.core.interactiveshell import InteractiveShell
-from IPython.core.magic import Magics, magics_class, line_magic
-from typing import List
-
-@magics_class
-class FunctionMagics (Magics):
-
-    @line_magic
-    def fxn (self, line: str):
-        COMMANDS = {
-            "python": self.__python,
-            "image": self.__image,
-        }
-        args = line.split(" ")
-        command = COMMANDS.get(args[0], None)
-        if command is not None:
-            command(args[1:])
-        else:
-            raise RuntimeError(f"Unrecognized Function command: {args[0]}")
-
-    def __python (self, args: List[str]):
-        version = args[0]
-        print(f"Predictor will use Python {version} when running on Function")
-
-    def __image (self, args: List[str]):
-        image = args[0]
-        print(f"Predictor will use base image {image} when running on Function")
-
-def load_ipython_extension (ipython: InteractiveShell):
-    ipython.register_magics(FunctionMagics)

fxn/services/environment.py

@@ -1,111 +0,0 @@
-#
-#   Function
-#   Copyright © 2024 NatML Inc. All Rights Reserved.
-#
-
-from typing import List
-
-from ..api import GraphClient
-from ..types import EnvironmentVariable
-
-class EnvironmentVariableService:
-
-    def __init__ (self, client: GraphClient) -> None:
-        self.client = client
-        self.__value = "xxxxxxxx"
-
-    def list (self, organization: str=None) -> List[EnvironmentVariable]:
-        """
-        List the current user's environment variables.
-
-        Note that the variable values can only viewed at https://fxn.ai.
-
-        Parameters:
-            organization (str): Organization username.
-
-        Returns:
-            list: User environment variables.
-        """
-        # Query
-        response = self.client.query(f"""
-            query ($input: UserInput) {{
-                user (input: $input) {{
-                    ... on User {{
-                        environmentVariables {{
-                            {ENVIRONMENT_VARIABLE_FIELDS}
-                        }}
-                    }}
-                    ... on Organization {{
-                        environmentVariables {{
-                            {ENVIRONMENT_VARIABLE_FIELDS}
-                        }}
-                    }}
-                }}
-            }}
-            """,
-            { "input": { "username": organization } if organization is not None else None }
-        )
-        # Create envs
-        assert response["user"] is not None, "Failed to list environment variables because user could not be found. Check that you are authenticated."
-        environments = response["user"]["environmentVariables"]
-        environments = [EnvironmentVariable(**env, value=self.__value) for env in environments]
-        # Return
-        return environments
-    
-    def create (self, name: str, value: str, organization: str=None) -> EnvironmentVariable:
-        """
-        Create an environment variable.
-
-        This environment variable will apply to all predictors you create.
-
-        Parameters:
-            name (str): Variable name.
-            value (str): Variable value.
-            organization (str): Organization username. Use this for organization environment variables.
-
-        Returns:
-            EnvironmentVariable: Created environment variable.
-        """
-        # Query
-        response = self.client.query(f"""
-            mutation ($input: CreateEnvironmentVariableInput!) {{
-                environment: createEnvironmentVariable (input: $input) {{
-                    {ENVIRONMENT_VARIABLE_FIELDS}
-                }}
-            }}
-            """,
-            { "input": { "name": name, "value": value, "organization": organization } }
-        )
-        # Create env
-        environment = response["environment"]
-        environment = EnvironmentVariable(**environment, value=self.__value)
-        # Return
-        return environment
-    
-    def delete (self, name: str, organization: str=None) -> bool:
-        """
-        Delete an environment variable.
-
-        Parameters:
-            name (str): Variable name.
-            organization (str): Organization username. Use this for organization environment variables.
-            access_key (str): Function access key.
-        
-        Returns:
-            bool: Whether the environment variable was successfully deleted.
-        """
-        # Query
-        response = self.client.query(f"""
-            mutation ($input: DeleteEnvironmentVariableInput!) {{
-                result: deleteEnvironmentVariable (input: $input)
-            }}
-            """,
-            { "input": { "name": name, "organization": organization } }
-        )
-        # Return
-        return response["result"]
-
-    
-ENVIRONMENT_VARIABLE_FIELDS = f"""
-name
-"""

fxn/services/storage.py

@@ -1,159 +0,0 @@
-# 
-#   Function
-#   Copyright © 2024 NatML Inc. All Rights Reserved.
-#
-
-from base64 import b64encode
-from io import BytesIO
-from magika import Magika
-from pathlib import Path
-from requests import put
-from rich.progress import open as open_progress, wrap_file
-from urllib.parse import urlparse, urlunparse
-
-from ..api import GraphClient
-from ..types import UploadType
-
-class StorageService:
-
-    def __init__ (self, client: GraphClient) -> None:
-        self.client = client
-
-    def create_upload_url (self, name: str, type: UploadType, key: str=None) -> str:
-        """
-        Create an upload URL.
-
-        Parameters:
-            name (str): File name.
-            type (UploadType): Upload type.
-            key (str): File key. This is useful for grouping related files.
-
-        Returns:
-            str: File upload URL.
-        """
-        # Query
-        response = self.client.query(f"""
-            mutation ($input: CreateUploadUrlInput!) {{
-                createUploadUrl (input: $input)
-            }}
-            """,
-            { "input": { "type": type, "name": name, "key": key } }
-        )
-        # Return
-        return response["createUploadUrl"]
-    
-    def upload (
-        self,
-        file: str | Path | BytesIO,
-        *,
-        type: UploadType,
-        name: str=None,
-        data_url_limit: int=None,
-        key: str=None,
-        verbose: bool=False
-    ) -> str:
-        """
-        Upload a file and return the URL.
-
-        Parameters:
-            file (str | Path | BytesIO): Input file.
-            type (UploadType): File type.
-            name (str): File name. This MUST be provided if `file` is not a file path.
-            data_url_limit (int): Return a data URL if the file is smaller than this limit (in bytes).
-            key (str): File key. This is useful for grouping related files.
-            verbose (bool): Print a progress bar for the upload.
-
-        Returns:
-            str: Upload URL.
-        """
-        file = Path(file) if isinstance(file, str) else file
-        if isinstance(file, Path):
-            return self.__upload_file(file, type=type, name=name, key=key, data_url_limit=data_url_limit, verbose=verbose)
-        else:
-            return self.__upload_buffer(file, type=type, name=name, key=key, data_url_limit=data_url_limit, verbose=verbose)
-        
-    def __upload_file (
-        self,
-        file: Path,
-        *,
-        type: UploadType,
-        name: str=None,
-        key: str=None,
-        data_url_limit: int=None,
-        verbose: bool=False
-    ) -> str:
-        # Check file
-        assert file.exists(), f"Cannot upload {file.name} because the file does not exist"
-        assert file.is_file(), f"Cannot upload {file.name} becaause it does not point to a file"   
-        # Create data URL
-        mime = self.__infer_mime(file)
-        if file.stat().st_size < (data_url_limit or 0):
-            with open(file, mode="rb") as f:
-                buffer = BytesIO(f.read())
-            return self.__create_data_url(buffer, mime=mime)
-        # Upload
-        name = name or file.name
-        url = self.create_upload_url(name, type, key=key)
-        with open_progress(file, mode="rb", description=name, disable=not verbose) as f:
-            put(url, data=f, headers={ "Content-Type": mime }).raise_for_status()
-        # Return
-        return self.__simplify_url(url)
-    
-    def __upload_buffer (
-        self,
-        file: BytesIO,
-        *,
-        type: UploadType,
-        name: str=None,
-        key: str=None,
-        data_url_limit: int=None,
-        verbose: bool=False
-    ) -> str:
-        # Check name
-        assert name, "You must specify the file `name` if the `file` is not a path"
-        # Create data URL
-        file.seek(0)
-        mime = self.__infer_mime(file)
-        size = file.getbuffer().nbytes
-        if size < (data_url_limit or 0):
-            return self.__create_data_url(file, mime=mime)
-        # Upload
-        url = self.create_upload_url(name, type, key=key)
-        with wrap_file(file, total=size, description=name, disable=not verbose) as f:
-            put(url, data=f, headers={ "Content-Type": mime }).raise_for_status()
-        # Return
-        return self.__simplify_url(url)
-    
-    def __create_data_url (self, file: BytesIO, *, mime: str) -> str:
-        encoded_data = b64encode(file.getvalue()).decode("ascii")
-        url = f"data:{mime};base64,{encoded_data}"
-        return url
-    
-    def __simplify_url (self, url: str) -> str:
-        if url.startswith("data:"):
-            return url
-        parsed_url = urlparse(url)
-        parsed_url = parsed_url._replace(netloc="cdn.fxn.ai", query="")
-        url = urlunparse(parsed_url)
-        return url
-    
-    def __infer_mime (self, file: str | Path | BytesIO) -> str:
-        MAGIC_TO_MIME = {
-            b"\x00\x61\x73\x6d": "application/wasm"
-        }
-        # Read magic
-        file = Path(file) if isinstance(file, str) else file
-        if isinstance(file, Path):
-            with open(file, "rb") as f:
-                magic = f.read(4)
-        elif isinstance(file, BytesIO):
-            magic = file.getvalue()[:4]
-        # Check known mime
-        mime = MAGIC_TO_MIME.get(magic)
-        # Infer
-        if mime is None:
-            magika = Magika()
-            result = magika.identify_bytes(file.getvalue()) if isinstance(file, BytesIO) else magika.identify_path(file)
-            mime = result.output.mime_type
-        # Return
-        return mime