qwak-sdk 0.5.87__tar.gz → 0.5.89__tar.gz

{qwak_sdk-0.5.87 → qwak_sdk-0.5.89}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: qwak-sdk
-Version: 0.5.87
+Version: 0.5.89
 Summary: Qwak SDK and CLI for qwak models
 License: Apache-2.0
 Keywords: mlops,ml,deployment,serving,model
@@ -27,18 +27,15 @@ Requires-Dist: cookiecutter
 Requires-Dist: croniter (==1.4.1)
 Requires-Dist: gitpython (>=2.1.0)
 Requires-Dist: joblib (>=1.1.0,<2.0.0) ; extra == "batch" or extra == "feedback"
-Requires-Dist: numpy (<=1.24.0) ; python_full_version >= "3.7.1" and python_full_version <= "3.8.0"
-Requires-Dist: numpy (>=1.24.0) ; python_full_version > "3.8.0"
-Requires-Dist: pandas (<1.4) ; (python_full_version >= "3.7.1" and python_version < "3.8") and (extra == "batch" or extra == "feedback" or extra == "feature-store")
-Requires-Dist: pandas (>1.0) ; (python_version >= "3.8" and python_version < "3.9") and (extra == "batch" or extra == "feedback" or extra == "feature-store")
+Requires-Dist: numpy (<2.0.0)
 Requires-Dist: pandas (>1.1.3) ; (python_version >= "3.9" and python_version < "3.10") and (extra == "batch" or extra == "feedback" or extra == "feature-store")
 Requires-Dist: pandas (>=1.4.0) ; (python_version >= "3.10" and python_version < "3.12") and (extra == "batch" or extra == "feedback" or extra == "feature-store")
-Requires-Dist: pyarrow (>=6.0.0,<11.0.0) ; extra == "batch" or extra == "feature-store"
+Requires-Dist: pyarrow (>=6.0.0) ; extra == "batch" or extra == "feature-store"
 Requires-Dist: pyathena (>=2.2.0,!=2.18.0) ; extra == "feature-store"
 Requires-Dist: pyspark (==3.4.2) ; extra == "feature-store"
-Requires-Dist: python-json-logger (>=2.0.2)
-Requires-Dist: qwak-core (==0.4.180)
-Requires-Dist: qwak-inference (>=0.1.18,<0.2.0)
+Requires-Dist: python-json-logger (>=3.2.1,<4.0.0)
+Requires-Dist: qwak-core (==0.4.220)
+Requires-Dist: qwak-inference (>=0.1.20,<0.2.0)
 Requires-Dist: rich (>=13.0.0)
 Requires-Dist: tabulate (>=0.8.0)
 Requires-Dist: yaspin (>=2.0.0)

{qwak_sdk-0.5.87 → qwak_sdk-0.5.89}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "qwak-sdk"
-version = "0.5.87"
+version = "0.5.89"
 description = "Qwak SDK and CLI for qwak models"
 authors = ["Qwak <info@qwak.com>"]
 readme = "README.md"
@@ -29,31 +29,27 @@ qwak = "qwak_sdk.main:qwak_cli"
 
 [tool.poetry.dependencies]
 python = ">=3.9,<3.12"
-qwak-core = "0.4.180"
-qwak-inference = "~0.1.18"
-croniter = "==1.4.1"
+qwak-core = "0.4.220"
+qwak-inference = "^0.1.20"
+croniter = "1.4.1"
 tabulate = ">=0.8.0"
-python-json-logger = ">=2.0.2"
+python-json-logger = "^3.2.1"
 yaspin = ">=2.0.0"
 rich = ">=13.0.0"
 cookiecutter = "*"
 gitpython = ">=2.1.0"
 boto3 = { version = "^1.24.116", optional = true } # Inference dependencies
 pandas = [# Inference dependencies
-    { version = "<1.4", python = ">=3.7.1,<3.8", optional = true },
-    { version = ">1.0", python = ">=3.8,<3.9", optional = true },
     { version = ">1.1.3", python = ">=3.9,<3.10", optional = true },
     { version = ">=1.4.0", python = ">=3.10,<3.12", optional = true }
 ]
-numpy = [# Inference dependencies
-    { version = "<=1.24.0", python = ">=3.7.1,<=3.8", optional = true },
-    { version = ">=1.24.0", python = ">3.8", optional = true }
-]
+numpy = "<2.0.0"
+
 joblib = { version = "^1.1.0", optional = true } # Inference dependencies
-pyarrow = { version = ">=6.0.0, <11.0.0", optional = true } # Inference, feature-store dependencies
+pyarrow = { version = ">=6.0.0", optional = true } # Inference, feature-store dependencies
 pyathena = { version = ">=2.2.0,!=2.18.0", optional = true } # feature-store dependencies
-cloudpickle = {version = "==2.2.1", optional = true} # feature-store dependencies
-pyspark = {version = "==3.4.2", optional = true} # feature-store dependencies
+cloudpickle = {version = "2.2.1", optional = true} # feature-store dependencies
+pyspark = {version = "3.4.2", optional = true} # feature-store dependencies
 
 [tool.poetry.group.dev.dependencies]
 pytest = "7.2.1"

{qwak_sdk-0.5.87 → qwak_sdk-0.5.89}/qwak_sdk/__init__.py

@@ -1,6 +1,6 @@
 # fmt: off
 __author__ = '''Qwak.ai'''
-__version__ = '0.5.87'
+__version__ = '0.5.89'
 
 from qwak.inner import wire_dependencies
 

{qwak_sdk-0.5.87 → qwak_sdk-0.5.89}/qwak_sdk/commands/models/create/_logic.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 from _qwak_proto.qwak.projects.projects_pb2 import (
     CreateProjectResponse,
     GetProjectResponse,
@@ -9,7 +11,13 @@ from qwak.exceptions import QwakException
 from qwak_sdk.exceptions import QwakCommandException
 
 
-def execute_model_create(model_name, model_description, project, project_id):
+def execute_model_create(
+    model_name,
+    model_description,
+    project,
+    project_id,
+    jfrog_project_key: Optional[str] = None,
+):
     if not (project or project_id):
         raise QwakCommandException("You nust supply either project or project_id")
 
@@ -25,11 +33,13 @@ def execute_model_create(model_name, model_description, project, project_id):
             print(f"Project with name {project} doesn't exist. Creating it.")
             project_creation: CreateProjectResponse = (
                 ProjectsManagementClient().create_project(
-                    project_name=project, project_description=""
+                    project_name=project,
+                    project_description="",
+                    jfrog_project_key=jfrog_project_key,
                 )
             )
             resolved_project_id = project_creation.project.project_id
 
     return ModelsManagementClient().create_model(
-        resolved_project_id, model_name, model_description
+        resolved_project_id, model_name, model_description, jfrog_project_key
     )

{qwak_sdk-0.5.87 → qwak_sdk-0.5.89}/qwak_sdk/commands/models/create/ui.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 import click
 
 from qwak_sdk.commands.models.create._logic import execute_model_create
@@ -10,6 +12,12 @@ from qwak_sdk.tools.colors import Color
 @click.argument("name", metavar="name", required=True)
 @click.option("--project", metavar="NAME", required=False, help="Project name")
 @click.option("--project-id", metavar="ID", required=False, help="Project id")
+@click.option(
+    "--jfrog-project-key",
+    metavar="ID",
+    required=False,
+    help="An existing jfrog project key",
+)
 @click.option(
     "--description",
     metavar="DESCRIPTION",
@@ -25,9 +33,19 @@ from qwak_sdk.tools.colors import Color
     required=False,
     help="The formatting style for commands output (choose from text, json)",
 )
-def model_create(name, description, project, project_id, format, **kwargs):
+def model_create(
+    name,
+    description,
+    project,
+    project_id,
+    format,
+    jfrog_project_key: Optional[str] = None,
+    **kwargs,
+):
     try:
-        response = execute_model_create(name, description, project, project_id)
+        response = execute_model_create(
+            name, description, project, project_id, jfrog_project_key
+        )
         if format == "json":
             output_as_json(response)
         else:

{qwak_sdk-0.5.87 → qwak_sdk-0.5.89}/qwak_sdk/commands/models/init/_logic/template/churn/{{cookiecutter.model_directory}}/main/conda.yml

@@ -3,8 +3,8 @@ channels:
   - defaults
   - conda-forge
 dependencies:
-  - python=3.8
+  - python=3.9
   - pip=22.2.2
   - pandas=1.1.5
-  - scikit-learn=0.24
-  - catboost=0.24.3
+  - scikit-learn=0.24.1
+  - catboost=0.26.1

{qwak_sdk-0.5.87 → qwak_sdk-0.5.89}/qwak_sdk/commands/models/init/_logic/template/credit_risk/{{cookiecutter.model_directory}}/main/conda.yml

@@ -3,8 +3,9 @@ channels:
   - defaults
   - conda-forge
 dependencies:
-  - python=3.8
+  - python=3.9
   - pip=22.2.2
   - pandas=1.1.5
   - scikit-learn=0.24.1
   - catboost=0.26.1
+  - numpy=1.24.0

{qwak_sdk-0.5.87 → qwak_sdk-0.5.89}/qwak_sdk/commands/models/init/_logic/template/titanic/{{cookiecutter.model_directory}}/main/conda.yml

@@ -3,8 +3,9 @@ channels:
   - defaults
   - conda-forge
 dependencies:
-  - python=3.8
+  - python=3.9
   - pip=22.2.2
   - pandas=1.1.5
   - scikit-learn=0.24.1
   - catboost=0.26.1
+  - numpy=1.24.0

{qwak_sdk-0.5.87 → qwak_sdk-0.5.89}/qwak_sdk/commands/models/init/_logic/template/titanic_poetry/{{cookiecutter.model_directory}}/main/pyproject.toml

@@ -5,13 +5,15 @@ description = "A model to perdict whether a person survived the titanic crash or
 authors = ["Qwak AI <info@qwak.ai>"]
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = "^3.9"
 
 [tool.poetry.dev-dependencies]
 pip = "22.2.2"
 pandas = "1.1.5"
 scikit-learn = "0.24.1"
 catboost = "0.26.1"
+numpy = "1.23.5"
+setuptools = "70.0.0"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

qwak_sdk-0.5.89/qwak_sdk/commands/projects/create/_logic.py

@@ -0,0 +1,14 @@
+from typing import Optional
+
+from qwak.clients.project.client import ProjectsManagementClient
+
+
+def execute(
+    project_name: str,
+    project_description: str,
+    jfrog_project_key: Optional[str] = None,
+):
+    projects_management = ProjectsManagementClient()
+    return projects_management.create_project(
+        project_name, project_description, jfrog_project_key
+    )

{qwak_sdk-0.5.87 → qwak_sdk-0.5.89}/qwak_sdk/commands/projects/create/ui.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 import click
 
 from qwak_sdk.commands.projects.create._logic import execute as execute_create
@@ -22,8 +24,21 @@ from qwak_sdk.inner.tools.cli_tools import QwakCommand
     required=False,
     help="The formatting style for commands output (choose from text, json)",
 )
-def create_project(name, description, format, *args, **kwargs):
-    response = execute_create(name, description)
+@click.option(
+    "--jfrog-project-key",
+    metavar="ID",
+    required=False,
+    help="An existing jfrog project key",
+)
+def create_project(
+    name,
+    description,
+    format,
+    jfrog_project_key: Optional[str] = None,
+    *args,
+    **kwargs,
+):
+    response = execute_create(name, description, jfrog_project_key=jfrog_project_key)
     if format == "json":
         output_as_json(response)
     else:

{qwak_sdk-0.5.87 → qwak_sdk-0.5.89}/qwak_sdk/inner/tools/logger/logging.yml

@@ -11,11 +11,11 @@ formatters:
     format: '%(asctime)s %(levelname)-8s %(module)s - %(lineno)d - %(message)s'
     datefmt: '%Y-%m-%d %H:%M:%S'
   remote:
-    class: pythonjsonlogger.jsonlogger.JsonFormatter
+    class: pythonjsonlogger.json.JsonFormatter
     format: '%(asctime)s %(process)d %(levelname)s %(module)s %(lineno)d %(message)s'
     datefmt: '%Y-%m-%dT%H:%M:%S'
   json:
-    class: pythonjsonlogger.jsonlogger.JsonFormatter
+    class: pythonjsonlogger.json.JsonFormatter
     format: '%(asctime)s %(process)d %(levelname)s %(module)s %(lineno)d %(message)s'
     datefmt: '%Y-%m-%dT%H:%M:%S'
 

qwak_sdk-0.5.87/qwak_sdk/commands/projects/create/_logic.py

@@ -1,6 +0,0 @@
-from qwak.clients.project.client import ProjectsManagementClient
-
-
-def execute(project_name: str, project_description: str):
-    projects_management = ProjectsManagementClient()
-    return projects_management.create_project(project_name, project_description)