frogml-cli 0.0.3__tar.gz → 0.0.4__tar.gz

{frogml_cli-0.0.3 → frogml_cli-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: frogml-cli
-Version: 0.0.3
+Version: 0.0.4
 Summary: Frogml CLI for frogml models
 License: Apache-2.0
 Keywords: mlops,ml,deployment,serving,model,jfrog
@@ -27,7 +27,7 @@ Requires-Dist: click (==8.1.8)
 Requires-Dist: cloudpickle (==2.2.1) ; extra == "feature-store"
 Requires-Dist: cookiecutter
 Requires-Dist: croniter (==1.4.1)
-Requires-Dist: frogml (>=1.1.61)
+Requires-Dist: frogml (>=1.1.96)
 Requires-Dist: frogml-inference (>=0.0.2,<0.0.3)
 Requires-Dist: gitpython (>=2.1.0)
 Requires-Dist: joblib (>=1.1.0,<2.0.0) ; extra == "batch" or extra == "feedback"

{frogml_cli-0.0.3 → frogml_cli-0.0.4}/frogml_cli/__init__.py

@@ -1,6 +1,6 @@
 # fmt: off
 __author__ = '''JFrog Ltd.'''
-__version__ = '0.0.3'
+__version__ = '0.0.4'
 __name__ = 'frogml_cli'
 
 from frogml import wire_dependencies

{frogml_cli-0.0.3 → frogml_cli-0.0.4}/frogml_cli/commands/audience/_logic/config/v1/audience_config.py

@@ -20,6 +20,7 @@ class AudienceConfig:
     def to_audience_route_entry(self, index: int = 0) -> AudienceRoutesEntry:
         return AudienceRoutesEntry(
             audience_id=self.id,
+            audience_name=self.name,
             order=index + 1,
             routes=[route.to_route_api() for route in self.routes],
         )

{frogml_cli-0.0.3 → frogml_cli-0.0.4}/frogml_cli/commands/config/add/ui.py

@@ -24,6 +24,7 @@ from frogml_cli.inner.tools.cli_tools import FrogMLCommand
 @click.option(
     "--interactive",
     metavar="INTERACTIVE",
+    is_flag=True,
     required=False,
     help="Login with interactive flow",
     default=False,

frogml_cli-0.0.4/frogml_cli/commands/models/delete/_logic.py

@@ -0,0 +1,20 @@
+from frogml._proto.qwak.models.models_pb2 import DeleteModelResponse
+from frogml._proto.qwak.projects.projects_pb2 import GetProjectResponse
+from frogml.core.clients.model_group_management import ModelGroupManagementClient
+from frogml.core.clients.model_management import ModelsManagementClient
+from frogml.core.exceptions import FrogmlException
+
+
+def execute_model_delete(project_key: str, model_id: str) -> DeleteModelResponse:
+    model_group_response: GetProjectResponse = (
+        ModelGroupManagementClient().get_model_group(model_group_name=project_key)
+    )
+    is_model_exists: bool = any(
+        m.model_id == model_id for m in model_group_response.project.models
+    )
+    if not is_model_exists:
+        raise FrogmlException(f"No such model {model_id} for project {project_key}")
+
+    model_group_id: str = model_group_response.project.spec.project_id
+
+    return ModelsManagementClient().delete_model(model_group_id, model_id)

{frogml_cli-0.0.3 → frogml_cli-0.0.4}/frogml_cli/commands/models/delete/ui.py

@@ -1,4 +1,7 @@
+from typing import Literal
+
 import click
+from frogml._proto.qwak.models.models_pb2 import DeleteModelResponse
 
 from frogml_cli.commands.models.delete._logic import execute_model_delete
 from frogml_cli.commands.ui_tools import output_as_json
@@ -10,6 +13,7 @@ from frogml_cli.inner.tools.cli_tools import FrogMLCommand
 @click.option("--model-id", metavar="NAME", required=True, help="Model name")
 @click.option(
     "--format",
+    "output_format",
     default="text",
     show_default=True,
     type=click.Choice(["text", "json"], case_sensitive=True),
@@ -17,9 +21,12 @@ from frogml_cli.inner.tools.cli_tools import FrogMLCommand
     required=False,
     help="The formatting style for commands output (choose from text, json)",
 )
-def model_delete(project_key, model_id, format, **kwargs):
-    response = execute_model_delete(project_key, model_id)
-    if format == "json":
+def model_delete(
+    project_key: str, model_id: str, output_format: Literal["text", "json"]
+):
+    response: DeleteModelResponse = execute_model_delete(project_key, model_id)
+
+    if output_format == "json":
         output_as_json(response)
     else:
         print(f"Model deleted\nmodel id : {model_id}")

frogml_cli-0.0.4/frogml_cli/commands/models/list/_logic.py

@@ -0,0 +1,6 @@
+from frogml._proto.qwak.projects.projects_pb2 import GetProjectResponse
+from frogml.core.clients.model_group_management.client import ModelGroupManagementClient
+
+
+def execute_models_list(project_key: str) -> GetProjectResponse:
+    return ModelGroupManagementClient().get_model_group(model_group_name=project_key)

{frogml_cli-0.0.3 → frogml_cli-0.0.4}/frogml_cli/commands/models/list/ui.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+from typing import Literal
 
 import click
 from frogml._proto.qwak.projects.projects_pb2 import GetProjectResponse
@@ -25,6 +26,7 @@ def parse_model(model):
 @click.option("--project-key", metavar="NAME", required=True, help="JFrog project key")
 @click.option(
     "--format",
+    "output_format",
     default="text",
     show_default=True,
     type=click.Choice(["text", "json"], case_sensitive=True),
@@ -32,10 +34,14 @@ def parse_model(model):
     required=False,
     help="The formatting style for commands output (choose from text, json)",
 )
-def model_list(project_key: str, format, **kwargs):
-    model_list_result: GetProjectResponse = execute_models_list(project_key)
-    columns = ["Model id", "Display name", "Creation date", "Last updated"]
-    if format == "json":
-        output_as_json(model_list_result)
-    elif format == "text":
-        output_as_table(model_list_result.project.models, parse_model, headers=columns)
+def model_list(project_key: str, output_format: Literal["text", "json"]):
+    get_model_group_response: GetProjectResponse = execute_models_list(project_key)
+    columns: list[str] = ["Model id", "Display name", "Creation date", "Last updated"]
+
+    if output_format == "json":
+        output_as_json(get_model_group_response)
+
+    else:  # output_format == "text"
+        output_as_table(
+            get_model_group_response.project.models, parse_model, headers=columns
+        )

frogml_cli-0.0.4/frogml_cli/commands/models/list_models/_logic.py

@@ -0,0 +1,13 @@
+from frogml._proto.qwak.models.models_pb2 import ListModelsResponse
+from frogml._proto.qwak.projects.projects_pb2 import GetProjectResponse
+from frogml.core.clients.model_group_management import ModelGroupManagementClient
+from frogml.core.clients.model_management.client import ModelsManagementClient
+
+
+def list_models(project_key: str) -> ListModelsResponse:
+    model_group_response: GetProjectResponse = (
+        ModelGroupManagementClient().get_model_group(model_group_name=project_key)
+    )
+    model_group_id: str = model_group_response.project.spec.project_id
+
+    return ModelsManagementClient().list_models(model_group_id)

{frogml_cli-0.0.3 → frogml_cli-0.0.4}/frogml_cli/commands/models/list_models/ui.py

@@ -1,12 +1,18 @@
+from typing import Literal
+
 import click
-from frogml._proto.qwak.models.models_pb2 import DeploymentModelStatus
+from frogml._proto.qwak.models.models_pb2 import (
+    DeploymentModelStatus,
+    ListModelsResponse,
+    Model,
+)
 
 from frogml_cli.commands.models.list_models._logic import list_models as _list_models
 from frogml_cli.commands.ui_tools import output_as_json, output_as_table
 from frogml_cli.inner.tools.cli_tools import FrogMLCommand
 
 
-def parse_model(model):
+def parse_model(model: Model) -> list[str]:
     return [
         model.model_id,
         model.uuid,
@@ -31,6 +37,7 @@ def parse_model(model):
 @click.option("--project-key", metavar="NAME", required=True, help="JFrog Project key")
 @click.option(
     "--format",
+    "output_format",
     default="text",
     show_default=True,
     type=click.Choice(["text", "json"], case_sensitive=True),
@@ -38,9 +45,9 @@ def parse_model(model):
     required=False,
     help="The formatting style for command output (choose from text, json)",
 )
-def list_models(project_key, format, **kwargs):
-    model_list_result = _list_models(project_key)
-    columns = [
+def list_models(project_key: str, output_format: Literal["text", "json"]):
+    model_list_result: ListModelsResponse = _list_models(project_key)
+    columns: list[str] = [
         "Model id",
         "Model UUID",
         "Model Name",
@@ -54,7 +61,8 @@ def list_models(project_key, format, **kwargs):
         "Branches",
         "Deployment Status",
     ]
-    if format == "json":
+
+    if output_format == "json":
         output_as_json(model_list_result)
-    elif format == "text":
+    else:  # output_format == "text"
         output_as_table(model_list_result.models, parse_model, headers=columns)

frogml_cli-0.0.4/frogml_cli/commands/models/metadata/_logic.py

@@ -0,0 +1,13 @@
+from frogml._proto.qwak.models.models_pb2 import ListModelsMetadataResponse
+from frogml._proto.qwak.projects.projects_pb2 import GetProjectResponse
+from frogml.core.clients.model_group_management import ModelGroupManagementClient
+from frogml.core.clients.model_management.client import ModelsManagementClient
+
+
+def list_models_metadata(project_key: str) -> ListModelsMetadataResponse:
+    model_group_response: GetProjectResponse = (
+        ModelGroupManagementClient().get_model_group(model_group_name=project_key)
+    )
+    model_group_id: str = model_group_response.project.spec.project_id
+
+    return ModelsManagementClient().list_models_metadata(model_group_id)

{frogml_cli-0.0.3 → frogml_cli-0.0.4}/frogml_cli/commands/models/metadata/ui.py

@@ -1,6 +1,8 @@
 import re
+from typing import Literal
 
 import click
+from frogml._proto.qwak.models.models_pb2 import ListModelsMetadataResponse
 from google.protobuf.json_format import MessageToDict
 from tabulate import tabulate
 
@@ -45,6 +47,7 @@ def print_text_data(metadata):
 @click.option("--project-key", metavar="NAME", required=True, help="JFrog Project key")
 @click.option(
     "--format",
+    "output_format",
     default="text",
     show_default=True,
     type=click.Choice(["text", "json"], case_sensitive=True),
@@ -52,9 +55,10 @@ def print_text_data(metadata):
     required=False,
     help="The formatting style for command output (choose from text, json)",
 )
-def list_models_metadata(project_key, format, **kwargs):
-    model_list_result = _list_models_metadata(project_key)
-    if format == "json":
+def list_models_metadata(project_key: str, output_format: Literal["text", "json"]):
+    model_list_result: ListModelsMetadataResponse = _list_models_metadata(project_key)
+
+    if output_format == "json":
         output_as_json(model_list_result)
-    elif format == "text":
+    else:  # output_format == "text"
         print_text_data(model_list_result)

{frogml_cli-0.0.3 → frogml_cli-0.0.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "frogml-cli"
-version = "0.0.3"
+version = "0.0.4"
 description = "Frogml CLI for frogml models"
 authors = ["JFrog Ltd. <contact@jfrog.com>"]
 readme = "README.md"
@@ -49,7 +49,7 @@ pyspark = {version = "3.4.2", optional = true} # feature-store dependencies
 click = "8.1.8"
 catboost = ">=1.1.11"
 frogml-inference = "^0.0.2"
-frogml = ">=1.1.61"
+frogml = ">=1.1.96"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "7.2.1"

frogml_cli-0.0.3/frogml_cli/commands/models/delete/_logic.py

@@ -1,18 +0,0 @@
-from frogml._proto.qwak.projects.projects_pb2 import GetProjectResponse
-from frogml.core.clients.model_management import ModelsManagementClient
-from frogml.core.clients.project.client import ProjectsManagementClient
-from frogml.core.exceptions import FrogmlException
-
-
-def execute_model_delete(project_key: str, model_id: str):
-    project_response: GetProjectResponse = ProjectsManagementClient().get_project(
-        project_name=project_key
-    )
-    is_model_exists: bool = any(
-        m.model_id == model_id for m in project_response.project.models
-    )
-    if not is_model_exists:
-        raise FrogmlException(f"No such model {model_id} for project {project_key}")
-
-    project_id: str = project_response.project.spec.project_id
-    return ModelsManagementClient().delete_model(project_id, model_id)

frogml_cli-0.0.3/frogml_cli/commands/models/list/_logic.py

@@ -1,5 +0,0 @@
-from frogml.core.clients.project.client import ProjectsManagementClient
-
-
-def execute_models_list(project_key: str):
-    return ProjectsManagementClient().get_project(project_name=project_key)

frogml_cli-0.0.3/frogml_cli/commands/models/list_models/_logic.py

@@ -1,11 +0,0 @@
-from frogml._proto.qwak.projects.projects_pb2 import GetProjectResponse
-from frogml.core.clients.model_management.client import ModelsManagementClient
-from frogml.core.clients.project.client import ProjectsManagementClient
-
-
-def list_models(project_key: str):
-    project_response: GetProjectResponse = ProjectsManagementClient().get_project(
-        project_name=project_key
-    )
-    project_id: str = project_response.project.spec.project_id
-    return ModelsManagementClient().list_models(project_id)

frogml_cli-0.0.3/frogml_cli/commands/models/metadata/_logic.py

@@ -1,12 +0,0 @@
-from frogml._proto.qwak.projects.projects_pb2 import GetProjectResponse
-from frogml.core.clients.model_management.client import ModelsManagementClient
-from frogml.core.clients.project.client import ProjectsManagementClient
-
-
-def list_models_metadata(project_key: str):
-    project_response: GetProjectResponse = ProjectsManagementClient().get_project(
-        project_name=project_key
-    )
-    project_id: str = project_response.project.spec.project_id
-
-    return ModelsManagementClient().list_models_metadata(project_id)