truefoundry 0.5.8rc2__tar.gz → 0.5.8rc3__tar.gz

truefoundry-0.5.8rc3/PKG-INFO

@@ -0,0 +1,79 @@
+Metadata-Version: 2.3
+Name: truefoundry
+Version: 0.5.8rc3
+Summary: TrueFoundry CLI
+Author: Abhishek Choudhary
+Author-email: abhishek@truefoundry.com
+Requires-Python: >=3.8.1,<3.13
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Provides-Extra: workflow
+Requires-Dist: GitPython (>=3.1.43,<4.0.0)
+Requires-Dist: Mako (>=1.1.6,<2.0.0)
+Requires-Dist: PyJWT (>=2.0.0,<3.0.0)
+Requires-Dist: PyYAML (>=6.0.0,<7.0.0)
+Requires-Dist: aenum (>=3.0.0,<4.0.0)
+Requires-Dist: click (>=7.0.0,<9.0.0)
+Requires-Dist: coolname (>=1.1.0,<2.0.0)
+Requires-Dist: docker (>=6.1.2,<8.0.0)
+Requires-Dist: filelock (>=3.8.0,<4.0.0)
+Requires-Dist: flytekit (==1.13.13) ; extra == "workflow"
+Requires-Dist: gitignorefile (>=1.1.2,<2.0.0)
+Requires-Dist: importlib-metadata (>=4.11.3,<9.0.0)
+Requires-Dist: importlib-resources (>=5.2.0,<7.0.0)
+Requires-Dist: numpy (>=1.23.0,<2.0.0) ; python_version < "3.12"
+Requires-Dist: numpy (>=1.26.0,<2.0.0) ; python_version >= "3.12"
+Requires-Dist: openai (>=1.16.2,<2.0.0)
+Requires-Dist: packaging (>=20.0,<25.0)
+Requires-Dist: pydantic (>=1.8.2,<3.0.0)
+Requires-Dist: pygments (>=2.12.0,<3.0.0)
+Requires-Dist: python-dateutil (>=2.8.2,<3.0.0)
+Requires-Dist: python-dotenv (>=1.0.1,<2.0.0)
+Requires-Dist: python-socketio[client] (>=5.5.2,<6.0.0)
+Requires-Dist: questionary (>=1.10.0,<2.0.0)
+Requires-Dist: requests (>=2.18.0,<3.0.0)
+Requires-Dist: requirements-parser (>=0.11.0,<0.12.0)
+Requires-Dist: rich (>=13.7.1,<14.0.0)
+Requires-Dist: rich-click (>=1.2.1,<2.0.0)
+Requires-Dist: scipy (>=1.12.0,<2.0.0) ; python_version >= "3.12"
+Requires-Dist: scipy (>=1.5.0,<2.0.0) ; python_version < "3.12"
+Requires-Dist: tqdm (>=4.0.0,<5.0.0)
+Requires-Dist: typing-extensions (>=4.0)
+Requires-Dist: urllib3 (>=1.26.18,<3)
+Requires-Dist: yq (>=3.1.0,<4.0.0)
+Description-Content-Type: text/markdown
+
+# TrueFoundry
+
+TrueFoundry library to help you interact with the platform programmatically by
+
+- Interacting with the deployments side of TrueFoundry, enabling you to manage workspaces, deployments, applications, and view logs.
+- Providing experiment tracking capabilities, allowing you to track ML experiments and interact with ML repositories within TrueFoundry.
+
+You can access the health of your service, monitoring links, deployed endpoints and track metadata and artifacts by logging on to TrueFoundry's dashboard.
+
+## Installation
+
+To install the `TrueFoundry CLI`, you can use pip:
+
+```bash
+pip install truefoundry
+```
+
+To install the `TrueFoundry CLI` with Workflow deployment features, you can use pip:
+
+```bash
+pip install truefoundry[workflow]
+```
+
+## Examples
+
+https://github.com/truefoundry/getting-started-examples
+
+## Documentation
+
+https://docs.truefoundry.com/
+

truefoundry-0.5.8rc3/pyproject.toml

@@ -0,0 +1,173 @@
+[tool.poetry]
+name = "truefoundry"
+version = "0.5.8rc3"
+description = "TrueFoundry CLI"
+authors = ["Abhishek Choudhary <abhishek@truefoundry.com>"]
+readme = "README.md"
+
+[tool.poetry.dependencies]
+python = ">=3.8.1,<3.13"
+aenum = ">=3.0.0,<4.0.0"
+click = ">=7.0.0,<9.0.0"
+coolname = ">=1.1.0,<2.0.0"
+docker = ">=6.1.2,<8.0.0"
+filelock = ">=3.8.0,<4.0.0"
+flytekit = { version = "1.13.13", optional = true }
+gitignorefile = ">=1.1.2,<2.0.0"
+GitPython = ">=3.1.43,<4.0.0"
+importlib-metadata = ">=4.11.3,<9.0.0"
+importlib-resources = ">=5.2.0,<7.0.0"
+Mako = ">=1.1.6,<2.0.0"
+openai = ">=1.16.2,<2.0.0"
+packaging = ">=20.0,<25.0"
+pydantic = ">=1.8.2,<3.0.0"
+pygments = ">=2.12.0,<3.0.0"
+PyJWT = ">=2.0.0,<3.0.0"
+python-dateutil = ">=2.8.2,<3.0.0"
+python-dotenv = ">=1.0.1,<2.0.0"
+python-socketio = { version = ">=5.5.2,<6.0.0", extras = ["client"] }
+PyYAML = ">=6.0.0,<7.0.0"
+questionary = ">=1.10.0,<2.0.0"
+requests = ">=2.18.0,<3.0.0"
+requirements-parser = ">=0.11.0,<0.12.0"
+rich = ">=13.7.1,<14.0.0"
+rich-click = ">=1.2.1,<2.0.0"
+tqdm = ">=4.0.0,<5.0.0"
+typing-extensions = ">=4.0"
+urllib3 = ">=1.26.18,<3"
+yq = ">=3.1.0,<4.0.0"
+# Check and try to eliminate libs below this comment
+scipy = [
+    # This is split into two because poetry will select a version which has no wheel on python >= 3.12 :/
+    { version = ">=1.5.0,<2.0.0", python = "<3.12" },
+    { version = ">=1.12.0,<2.0.0", python = ">=3.12" },
+]
+numpy = [
+    # This is split into two because poetry will select a version which has no wheel on python >= 3.12 :/
+    { version = ">=1.23.0,<2.0.0", python = "<3.12" },
+    { version = ">=1.26.0,<2.0.0", python = ">=3.12" },
+]
+
+
+[tool.poetry.extras]
+workflow = ["flytekit"]
+
+[tool.poetry.group.dev.dependencies]
+Pillow = ">=9.1.1,<11.0.0"
+ipykernel = ">=6.16.0"
+ipywidgets = ">=8.0.0"
+ipython = ">=7.10.0"
+langchain = ">=0.2.0,<0.3.0"
+matplotlib = ">=3.0.0,<4.0.0"
+mypy = ">=1.14.1"
+plotly = ">=5.8.2,<6.0.0"
+pandas = [
+    # This is split into two because poetry will select a version which has no wheel on python >= 3.10 :/
+    { version = ">=1.0.0,<3.0.0", python = "<3.10" },
+    { version = ">=1.4.0,<3.0.0", python = ">=3.10" },
+]
+pre-commit = ">=3.5.0,<4.0.0"
+pytest = ">=8.2.2,<9.0.0"
+pytest-env = ">=1.1.5,<2.0.0"
+ruff = ">=0.9.4"
+seaborn = ">=0.13.0,<0.14.0"
+scikit-learn = ">=1.3.0,<2.0.0"
+shap =  [
+    { version = ">=0.40.0", python = "<3.12" },
+    { version = ">=0.45.0", python = ">=3.12" },
+]
+xgboost = "^2.1.3"
+
+
+[tool.poetry-dynamic-versioning]
+enable = false
+
+[build-system]
+requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning>=1.0.0,<2.0.0"]
+build-backend = "poetry_dynamic_versioning.backend"
+
+[tool.poetry.plugins."console_scripts"]
+tfy = "truefoundry.cli.__main__:main"
+truefoundry = "truefoundry.cli.__main__:main"
+
+[tool.ruff]
+lint.select = [
+    "E",  # pycodestyle errors
+    "W",  # pycodestyle warnings
+    "F",  # pyflakes
+    "C",  # flake8-comprehensions
+    "B",  # flake8-bugbear
+    "Q",  # flake8-quotes
+    "I",
+    "T10",
+    "ASYNC",
+]
+lint.ignore = [
+    "E501",
+]
+exclude = [
+    ".venv",
+    "venv",
+    "repos",
+    "truefoundry/ml/autogen/**",
+    "truefoundry/deploy/auto_gen/**",
+]
+
+[tool.ruff.lint.per-file-ignores]
+"__init__.py" = ["F401"]
+"truefoundry/ml/autogen/client/*" = ["B028", "B904", "C901", "C409", "F841"]
+"truefoundry/ml/autogen/client/models/*" = ["F821"]
+"truefoundry/ml/autogen/client/api_client.py" = ["E721"]
+
+[tool.mypy]
+plugins = [
+  "pydantic.v1.mypy"
+]
+install_types = true
+non_interactive = true
+
+allow_redefinition = false
+allow_untyped_globals = false
+check_untyped_defs = true
+disallow_any_generics = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+follow_imports = "silent"
+force_uppercase_builtins = true
+no_implicit_optional = true
+no_implicit_reexport = true
+strict_equality = true
+strict_optional = true
+warn_no_return = true
+warn_redundant_casts = true
+warn_return_any = true
+warn_unreachable = true
+warn_unused_ignores = true
+
+packages = [
+    "truefoundry",
+]
+exclude = [
+    "^truefoundry/ml/autogen",
+    "^truefoundry/deploy/auto_gen",
+    "^truefoundry/pydantic_v1.py$",
+    "^truefoundry/autodeploy/",
+]
+disable_error_code = [
+    "import-untyped",
+    "method-assign",
+]
+
+[tool.pydantic-mypy]
+init_forbid_extra = true
+init_typed = true
+warn_required_dynamic_aliases = true
+
+
+[tool.pytest.ini_options]
+env = [
+    "TFY_PYTHONBUILD_PYTHON_IMAGE_REPO=docker.io/truefoundrycloud/test/python",
+]

{truefoundry-0.5.8rc2 → truefoundry-0.5.8rc3}/truefoundry/common/entities.py

@@ -1,5 +1,4 @@
 import time
-from enum import Enum
 from typing import Optional
 
 import jwt
@@ -8,18 +7,12 @@ from typing_extensions import NotRequired, TypedDict
 from truefoundry.pydantic_v1 import BaseModel, Field, NonEmptyStr, validator
 
 
-class UserType(Enum):
-    user = "user"
-    serviceaccount = "serviceaccount"
-
-
 class UserInfo(BaseModel):
     class Config:
         allow_population_by_field_name = True
         allow_mutation = False
 
     user_id: NonEmptyStr
-    user_type: UserType = UserType.user
     email: Optional[str] = None
     tenant_name: NonEmptyStr = Field(alias="tenantName")
 
@@ -27,9 +20,16 @@ class UserInfo(BaseModel):
 class _DecodedToken(TypedDict):
     tenantName: str
     exp: int
-    username: str
+    username: NotRequired[str]
     email: NotRequired[str]
-    userType: UserType
+
+
+def _user_slug(decoded_token: _DecodedToken) -> str:
+    return (
+        decoded_token.get("username")
+        or decoded_token.get("email")
+        or "--user-slug-missing--"
+    )
 
 
 class Token(BaseModel):
@@ -55,19 +55,21 @@ class Token(BaseModel):
 
     @property
     def tenant_name(self) -> str:
+        assert self.decoded_value is not None
         return self.decoded_value["tenantName"]
 
     def is_going_to_be_expired(self, buffer_in_seconds: int = 120) -> bool:
+        assert self.decoded_value is not None
         exp = int(self.decoded_value["exp"])
         return (exp - time.time()) < buffer_in_seconds
 
     def to_user_info(self) -> UserInfo:
+        assert self.decoded_value is not None
         return UserInfo(
-            user_id=self.decoded_value["username"],
+            user_id=_user_slug(self.decoded_value),
             email=self.decoded_value["email"]
             if "email" in self.decoded_value
             else None,
-            user_type=UserType(self.decoded_value.get("userType", UserType.user.value)),
             tenant_name=self.tenant_name,
         )
 

{truefoundry-0.5.8rc2 → truefoundry-0.5.8rc3}/truefoundry/common/session.py

@@ -50,10 +50,9 @@ class Session:
 
             ACTIVE_SESSION = new_session
             logger.info(
-                "Logged in to %r as %r (%s)",
+                "Logged in to %r as %r",
                 new_session.tfy_host,
                 new_session.user_info.user_id,
-                new_session.user_info.email or new_session.user_info.user_type.value,
             )
 
             return ACTIVE_SESSION

{truefoundry-0.5.8rc2 → truefoundry-0.5.8rc3}/truefoundry/deploy/builder/docker_service.py

@@ -38,7 +38,7 @@ def _catch_error_in_push(response: List[dict]):
     for line in response:
         if line.get("error") is not None:
             raise Exception(
-                f"Failed to push to registry with message '{line.get('error')}'"
+                f'Failed to push to registry with message \'{line.get("error")}\''
             )
 
 

{truefoundry-0.5.8rc2 → truefoundry-0.5.8rc3}/truefoundry/deploy/lib/clients/servicefoundry_client.py

@@ -262,7 +262,7 @@ class ServiceFoundryServiceClient(BaseServiceFoundryServiceClient):
         time_obj.replace(tzinfo=timezone.utc)
         local_time = time_obj.astimezone(tzlocal())
         local_time_str = local_time.isoformat()
-        return f"[{local_time_str}] {log['log'].strip()}"
+        return f'[{local_time_str}] {log["log"].strip()}'
 
     def _tail_logs(
         self,

{truefoundry-0.5.8rc2 → truefoundry-0.5.8rc3}/truefoundry/deploy/lib/session.py

@@ -57,10 +57,9 @@ def login(
                     return login(api_key=api_key, host=host, relogin=True)
 
             user_info = cred_file_content.to_token().to_user_info()
-            user_name_display_info = user_info.email or user_info.user_type.value
             output_hook.print_line(
                 relogin_error_message(
-                    f"Already logged in to {cred_file_content.host!r} as {user_info.user_id!r} ({user_name_display_info})",
+                    f"Already logged in to {cred_file_content.host!r} as {user_info.user_id!r}",
                     host=host,
                 )
             )
@@ -81,10 +80,9 @@ def login(
         cred_file.write(cred_file_content)
 
     user_info = token.to_user_info()
-    user_name_display_info = user_info.email or user_info.user_type.value
     output_hook.print_line(
         f"Successfully logged in to {cred_file_content.host!r} as "
-        f"{user_info.user_id!r} ({user_name_display_info})"
+        f"{user_info.user_id!r}"
     )
     return True
 

{truefoundry-0.5.8rc2 → truefoundry-0.5.8rc3}/truefoundry/deploy/v2/lib/deploy.py

@@ -214,8 +214,8 @@ No Workspace FQN was provided or mentioned in the spec.
 Either add a `workspace_fqn` to your yaml spec as
 
 ```
-name: {getattr(component, "name", "my-app")}
-type: {getattr(component, "type", "undefined")}
+name: {getattr(component, 'name', 'my-app')}
+type: {getattr(component, 'type', 'undefined')}
 ...
 workspace_fqn: <your workspace fqn>
 ```
@@ -224,7 +224,7 @@ or Python deployment spec as
 
 ```
 app = {component.__class__.__name__}(
-    name='{getattr(component, "name", "my-app")}',
+    name='{getattr(component, 'name', 'my-app')}',
     ...
     workspace_fqn='<your workspace fqn>'
 )

{truefoundry-0.5.8rc2 → truefoundry-0.5.8rc3}/truefoundry/ml/log_types/plot.py

@@ -33,7 +33,7 @@ if TYPE_CHECKING:
 PlotObjType = Union[
     "matplotlib.figure.Figure",
     "plotly.graph_objects.Figure",
-    "matplotlib.pyplot",  # type: ignore[valid-type]
+    "matplotlib.pyplot",
 ]
 
 
@@ -103,7 +103,7 @@ def _save_matplotlib_figure(
 
 
 def _save_matplotlib_plt(
-    plt: "matplotlib.pyplot",  # type: ignore[valid-type]
+    plt: "matplotlib.pyplot",
     key: str,
     step: int,
     local_dir: str,

{truefoundry-0.5.8rc2 → truefoundry-0.5.8rc3}/truefoundry/ml/mlfoundry_run.py

@@ -1109,7 +1109,7 @@ class MlFoundryRun:
     @_ensure_not_deleted
     def log_plots(
         self,
-        plots: Dict[  # type: ignore[valid-type]
+        plots: Dict[
             str,
             Union[
                 "matplotlib.pyplot",

{truefoundry-0.5.8rc2 → truefoundry-0.5.8rc3}/truefoundry/ml/session.py

@@ -75,10 +75,9 @@ class MLFoundrySession(Session):
 
             ACTIVE_SESSION = new_session
             logger.info(
-                "Logged in to %r as %r (%s)",
+                "Logged in to %r as %r",
                 new_session.tfy_host,
                 new_session.user_info.user_id,
-                new_session.user_info.email or new_session.user_info.user_type.value,
             )
 
             return ACTIVE_SESSION

truefoundry-0.5.8rc2/.github/workflows/lint-and-test.yml

@@ -1,132 +0,0 @@
-name: Lint and Test TrueFoundry CLI on multiple platforms
-on:
-  pull_request:
-    branches:
-      - "main"
-
-  push:
-    branches:
-      - "main"
-
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.11"]
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@v5
-        with:
-          enable-cache: true
-          cache-dependency-glob: "uv.lock"
-
-      - name: Set up Python
-        run: uv venv --python ${{ matrix.python-version }} --seed
-
-      - name: Install the project
-        run: uv sync --locked  --all-extras --dev
-
-      - name: Check files with pre-commit
-        run: |
-          uv run pre-commit run --all-files --show-diff-on-failure -v
-
-  mypy:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.11"]
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@v5
-        with:
-          enable-cache: true
-          cache-dependency-glob: "uv.lock"
-
-      - name: Set up Python
-        run: uv venv --python ${{ matrix.python-version }} --seed
-
-      - name: Install the project
-        run: uv sync --locked  --all-extras --dev
-
-      - name: Run mypy
-        run: |
-          uv run bash run_mypy.sh
-
-  test-cli:
-    strategy:
-      max-parallel: 3
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest]
-        python-version: ["3.10"]
-
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 15
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@v5
-        with:
-          enable-cache: true
-          cache-dependency-glob: "uv.lock"
-
-      - name: Set up Python
-        run: uv venv --python ${{ matrix.python-version }} --seed
-
-      - name: Install non dev dependencies
-        run: uv sync --locked --no-dev
-
-      - name: Test TrueFoundry CLI invocations
-        run: |
-          uv run tfy --help
-          uv run tfy deploy --help
-          uv run tfy ml --help
-
-  test:
-    strategy:
-      max-parallel: 3
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.8", "3.12"]
-
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 15
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@v5
-        with:
-          enable-cache: true
-          cache-dependency-glob: "uv.lock"
-
-      - name: Set up Python
-        run: uv venv --python ${{ matrix.python-version }} --seed
-
-      # Install libomp for macOS
-      - name: Install libomp on macOS
-        if: runner.os == 'macOS'
-        run: |
-          brew install libomp
-
-      - name: Install the project
-        run: uv sync --locked  --all-extras --dev
-
-      - name: Run tests
-        run: |
-          uv run pytest --durations=0 tests/

truefoundry-0.5.8rc2/.github/workflows/release.yml

@@ -1,29 +0,0 @@
-name: Publish pip package to PyPI
-on:
-  push:
-    tags:
-      - v*
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@v5
-
-      - name: Enable dynamic versioning
-        run: uv run enable_dynamic_versioning.py
-
-      - name: Build project
-        run: uv build --python 3.10
-
-      - name: Publish distribution 📦 to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          verbose: true
-          user: __token__