qwak-core 0.4.362__py3-none-any.whl → 0.5.4__py3-none-any.whl

_qwak_proto/qwak/kube_deployment_captain/batch_job_pb2.pyi

@@ -509,10 +509,15 @@ class ModelIdentifier(google.protobuf.message.Message):
     BUILD_ID_FIELD_NUMBER: builtins.int
     BRANCH_ID_FIELD_NUMBER: builtins.int
     MODEL_UUID_FIELD_NUMBER: builtins.int
+    MODEL_GROUP_NAME_FIELD_NUMBER: builtins.int
     model_id: builtins.str
     build_id: builtins.str
     branch_id: builtins.str
     model_uuid: builtins.str
+    model_group_name: builtins.str
+    """the model group this model belongs to. Currently model group name is identical to the project name for jfrog flows.
+    in case this changes, the project name should not be assigned to the model group name anymore.
+    """
     def __init__(
         self,
         *,
@@ -520,8 +525,9 @@ class ModelIdentifier(google.protobuf.message.Message):
         build_id: builtins.str = ...,
         branch_id: builtins.str = ...,
         model_uuid: builtins.str = ...,
+        model_group_name: builtins.str = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["branch_id", b"branch_id", "build_id", b"build_id", "model_id", b"model_id", "model_uuid", b"model_uuid"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["branch_id", b"branch_id", "build_id", b"build_id", "model_group_name", b"model_group_name", "model_id", b"model_id", "model_uuid", b"model_uuid"]) -> None: ...
 
 global___ModelIdentifier = ModelIdentifier
 
@@ -572,6 +578,7 @@ class InferenceTaskConfigurationMessage(google.protobuf.message.Message):
     SERVICE_ACCOUNT_JSON_KEY_SECRET_FIELD_NUMBER: builtins.int
     IS_POINT_FILE_PATH_FIELD_NUMBER: builtins.int
     LIST_FILES_PRE_STEP_CONFIGURATION_FIELD_NUMBER: builtins.int
+    SESSION_TOKEN_FIELD_NUMBER: builtins.int
     source_bucket: builtins.str
     """The source bucket in cloud storage"""
     destination_bucket: builtins.str
@@ -600,6 +607,8 @@ class InferenceTaskConfigurationMessage(google.protobuf.message.Message):
     @property
     def list_files_pre_step_configuration(self) -> global___ListFilesPreStepConfiguration:
         """Optional pre step configuration, used to list files in the source directory and run inference on subset of files"""
+    session_token: builtins.str
+    """the session token required to use the bucket for batch inference"""
     def __init__(
         self,
         *,
@@ -616,9 +625,10 @@ class InferenceTaskConfigurationMessage(google.protobuf.message.Message):
         service_account_json_key_secret: builtins.str = ...,
         is_point_file_path: builtins.bool = ...,
         list_files_pre_step_configuration: global___ListFilesPreStepConfiguration | None = ...,
+        session_token: builtins.str = ...,
     ) -> None: ...
     def HasField(self, field_name: typing_extensions.Literal["list_files_pre_step_configuration", b"list_files_pre_step_configuration"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["cloud_provider", b"cloud_provider", "destination_bucket", b"destination_bucket", "destination_path", b"destination_path", "filepath", b"filepath", "input_file_type", b"input_file_type", "is_point_file_path", b"is_point_file_path", "list_files_pre_step_configuration", b"list_files_pre_step_configuration", "output_file_type", b"output_file_type", "parameters", b"parameters", "secret_secret", b"secret_secret", "service_account_json_key_secret", b"service_account_json_key_secret", "source_bucket", b"source_bucket", "token_secret", b"token_secret"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["cloud_provider", b"cloud_provider", "destination_bucket", b"destination_bucket", "destination_path", b"destination_path", "filepath", b"filepath", "input_file_type", b"input_file_type", "is_point_file_path", b"is_point_file_path", "list_files_pre_step_configuration", b"list_files_pre_step_configuration", "output_file_type", b"output_file_type", "parameters", b"parameters", "secret_secret", b"secret_secret", "service_account_json_key_secret", b"service_account_json_key_secret", "session_token", b"session_token", "source_bucket", b"source_bucket", "token_secret", b"token_secret"]) -> None: ...
 
 global___InferenceTaskConfigurationMessage = InferenceTaskConfigurationMessage
 

_qwak_proto/qwak/projects/projects_pb2.py

@@ -11,12 +11,12 @@ from google.protobuf.internal import builder as _builder
 _sym_db = _symbol_database.Default()
 
 
+from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
 from _qwak_proto.qwak.models import models_pb2 as qwak_dot_models_dot_models__pb2
 from _qwak_proto.qwak.projects import jfrog_project_spec_pb2 as qwak_dot_projects_dot_jfrog__project__spec__pb2
-from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1cqwak/projects/projects.proto\x12\x18qwak.projects.management\x1a\x18qwak/models/models.proto\x1a&qwak/projects/jfrog_project_spec.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xad\x03\n\x0eProjectRequest\x12P\n\x16\x63reate_project_request\x18\x01 \x01(\x0b\x32..qwak.projects.management.CreateProjectRequestH\x00\x12P\n\x16\x64\x65lete_project_request\x18\x02 \x01(\x0b\x32..qwak.projects.management.DeleteProjectRequestH\x00\x12P\n\x16update_project_request\x18\x03 \x01(\x0b\x32..qwak.projects.management.UpdateProjectRequestH\x00\x12J\n\x13get_project_request\x18\x04 \x01(\x0b\x32+.qwak.projects.management.GetProjectRequestH\x00\x12N\n\x15list_projects_request\x18\x05 \x01(\x0b\x32-.qwak.projects.management.ListProjectsRequestH\x00\x42\t\n\x07request\"\x91\x01\n\x14\x43reateProjectRequest\x12\x14\n\x0cproject_name\x18\x01 \x01(\t\x12\x1b\n\x13project_description\x18\x02 \x01(\t\x12\x46\n\njfrog_spec\x18\x03 \x01(\x0b\x32\x32.qwak.projects.management.ModelRepositoryJFrogSpec\"O\n\x15\x43reateProjectResponse\x12\x36\n\x07project\x18\x01 \x01(\x0b\x32%.qwak.projects.management.ProjectSpec\"\x15\n\x13ListProjectsRequest\"O\n\x14ListProjectsResponse\x12\x37\n\x08projects\x18\x01 \x03(\x0b\x32%.qwak.projects.management.ProjectSpec\"=\n\x11GetProjectRequest\x12\x12\n\nproject_id\x18\x01 \x01(\t\x12\x14\n\x0cproject_name\x18\x02 \x01(\t\"H\n\x12GetProjectResponse\x12\x32\n\x07project\x18\x01 \x01(\x0b\x32!.qwak.projects.management.Project\"*\n\x14\x44\x65leteProjectRequest\x12\x12\n\nproject_id\x18\x01 \x01(\t\"%\n\x15\x44\x65leteProjectResponse\x12\x0c\n\x04info\x18\x01 \x01(\t\"{\n\x14UpdateProjectRequest\x12\x12\n\nproject_id\x18\x01 \x01(\t\x12O\n\x13project_spec_config\x18\x02 \x01(\x0b\x32\x32.qwak.projects.management.ProjectSpecConfiguration\"T\n\x15UpdateProjectResponse\x12;\n\x0cproject_spec\x18\x01 \x01(\x0b\x32%.qwak.projects.management.ProjectSpec\"\xac\x01\n\x07Project\x12\x33\n\x04spec\x18\x01 \x01(\x0b\x32%.qwak.projects.management.ProjectSpec\x12\x31\n\x06models\x18\x02 \x03(\x0b\x32\x1d.qwak.models.management.ModelB\x02\x18\x01\x12\x39\n\rmodels_briefs\x18\x03 \x03(\x0b\x32\".qwak.models.management.ModelBrief\"\xeb\x03\n\x0bProjectSpec\x12\x12\n\nproject_id\x18\x01 \x01(\t\x12\x14\n\x0cproject_name\x18\x02 \x01(\t\x12\x1b\n\x13project_description\x18\x03 \x01(\t\x12\x44\n\x0eproject_status\x18\x04 \x01(\x0e\x32,.qwak.projects.management.ProjectSpec.Status\x12.\n\ncreated_at\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x12\n\ncreated_by\x18\x06 \x01(\t\x12\x34\n\x10last_modified_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x18\n\x10last_modified_by\x18\x08 \x01(\t\x12\x14\n\x0cmodels_count\x18\t \x01(\x05\x12\x15\n\rmodels_active\x18\n \x01(\x05\x12N\n\x0ejfrog_settings\x18\x0b \x01(\x0b\x32\x36.qwak.projects.management.ModelRepositoryJFrogSettings\">\n\x06Status\x12\x0b\n\x07INVALID\x10\x00\x12\x0c\n\x08\x44ISABLED\x10\x01\x12\r\n\tSUSPENDED\x10\x02\x12\n\n\x06\x41\x43TIVE\x10\x03\"M\n\x18ProjectSpecConfiguration\x12\x14\n\x0cproject_name\x18\x01 \x01(\t\x12\x1b\n\x13project_description\x18\x02 \x01(\t\"\xb1\x02\n\x1cModelRepositoryJFrogSettings\x12S\n\x11pull_image_secret\x18\x01 \x01(\x0b\x32\x38.qwak.projects.management.ModelRepositoryPullImageSecret\x12[\n\x15jfrog_project_details\x18\x02 \x01(\x0b\x32<.qwak.projects.management.ModelRepositoryJFrogProjectDetails\x12_\n\x1ajfrog_repositories_details\x18\x03 \x01(\x0b\x32;.qwak.projects.management.ModelRepositoryArtifactoryDetails\"@\n\x1eModelRepositoryPullImageSecret\x12\x1e\n\x16pull_image_secret_name\x18\x01 \x01(\t\"?\n\"ModelRepositoryJFrogProjectDetails\x12\x19\n\x11jfrog_project_key\x18\x01 \x01(\t\"\xb7\x02\n!ModelRepositoryArtifactoryDetails\x12[\n\x1b\x61rtifact_repository_details\x18\x01 \x01(\x0b\x32\x36.qwak.projects.management.ArtifactoryRepositoryDetails\x12Z\n\x1a\x64\x61taset_repository_details\x18\x02 \x01(\x0b\x32\x36.qwak.projects.management.ArtifactoryRepositoryDetails\x12Y\n\x19\x64ocker_repository_details\x18\x03 \x01(\x0b\x32\x36.qwak.projects.management.ArtifactoryRepositoryDetails\"6\n\x1c\x41rtifactoryRepositoryDetails\x12\x16\n\x0erepository_key\x18\x01 \x01(\t2\xc9\x04\n\x19ProjectsManagementService\x12p\n\rCreateProject\x12..qwak.projects.management.CreateProjectRequest\x1a/.qwak.projects.management.CreateProjectResponse\x12m\n\x0cListProjects\x12-.qwak.projects.management.ListProjectsRequest\x1a..qwak.projects.management.ListProjectsResponse\x12g\n\nGetProject\x12+.qwak.projects.management.GetProjectRequest\x1a,.qwak.projects.management.GetProjectResponse\x12p\n\rDeleteProject\x12..qwak.projects.management.DeleteProjectRequest\x1a/.qwak.projects.management.DeleteProjectResponse\x12p\n\rUpdateProject\x12..qwak.projects.management.UpdateProjectRequest\x1a/.qwak.projects.management.UpdateProjectResponseB\'\n#com.qwak.ai.management.projects.apiP\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1cqwak/projects/projects.proto\x12\x18qwak.projects.management\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x18qwak/models/models.proto\x1a&qwak/projects/jfrog_project_spec.proto\"\xad\x03\n\x0eProjectRequest\x12P\n\x16\x63reate_project_request\x18\x01 \x01(\x0b\x32..qwak.projects.management.CreateProjectRequestH\x00\x12P\n\x16\x64\x65lete_project_request\x18\x02 \x01(\x0b\x32..qwak.projects.management.DeleteProjectRequestH\x00\x12P\n\x16update_project_request\x18\x03 \x01(\x0b\x32..qwak.projects.management.UpdateProjectRequestH\x00\x12J\n\x13get_project_request\x18\x04 \x01(\x0b\x32+.qwak.projects.management.GetProjectRequestH\x00\x12N\n\x15list_projects_request\x18\x05 \x01(\x0b\x32-.qwak.projects.management.ListProjectsRequestH\x00\x42\t\n\x07request\"\x91\x01\n\x14\x43reateProjectRequest\x12\x14\n\x0cproject_name\x18\x01 \x01(\t\x12\x1b\n\x13project_description\x18\x02 \x01(\t\x12\x46\n\njfrog_spec\x18\x03 \x01(\x0b\x32\x32.qwak.projects.management.ModelRepositoryJFrogSpec\"O\n\x15\x43reateProjectResponse\x12\x36\n\x07project\x18\x01 \x01(\x0b\x32%.qwak.projects.management.ProjectSpec\"\x15\n\x13ListProjectsRequest\"O\n\x14ListProjectsResponse\x12\x37\n\x08projects\x18\x01 \x03(\x0b\x32%.qwak.projects.management.ProjectSpec\"=\n\x11GetProjectRequest\x12\x12\n\nproject_id\x18\x01 \x01(\t\x12\x14\n\x0cproject_name\x18\x02 \x01(\t\"H\n\x12GetProjectResponse\x12\x32\n\x07project\x18\x01 \x01(\x0b\x32!.qwak.projects.management.Project\"*\n\x14\x44\x65leteProjectRequest\x12\x12\n\nproject_id\x18\x01 \x01(\t\"%\n\x15\x44\x65leteProjectResponse\x12\x0c\n\x04info\x18\x01 \x01(\t\"{\n\x14UpdateProjectRequest\x12\x12\n\nproject_id\x18\x01 \x01(\t\x12O\n\x13project_spec_config\x18\x02 \x01(\x0b\x32\x32.qwak.projects.management.ProjectSpecConfiguration\"T\n\x15UpdateProjectResponse\x12;\n\x0cproject_spec\x18\x01 \x01(\x0b\x32%.qwak.projects.management.ProjectSpec\"\xac\x01\n\x07Project\x12\x33\n\x04spec\x18\x01 \x01(\x0b\x32%.qwak.projects.management.ProjectSpec\x12\x31\n\x06models\x18\x02 \x03(\x0b\x32\x1d.qwak.models.management.ModelB\x02\x18\x01\x12\x39\n\rmodels_briefs\x18\x03 \x03(\x0b\x32\".qwak.models.management.ModelBrief\"\xeb\x03\n\x0bProjectSpec\x12\x12\n\nproject_id\x18\x01 \x01(\t\x12\x14\n\x0cproject_name\x18\x02 \x01(\t\x12\x1b\n\x13project_description\x18\x03 \x01(\t\x12\x44\n\x0eproject_status\x18\x04 \x01(\x0e\x32,.qwak.projects.management.ProjectSpec.Status\x12.\n\ncreated_at\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x12\n\ncreated_by\x18\x06 \x01(\t\x12\x34\n\x10last_modified_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x18\n\x10last_modified_by\x18\x08 \x01(\t\x12\x14\n\x0cmodels_count\x18\t \x01(\x05\x12\x15\n\rmodels_active\x18\n \x01(\x05\x12N\n\x0ejfrog_settings\x18\x0b \x01(\x0b\x32\x36.qwak.projects.management.ModelRepositoryJFrogSettings\">\n\x06Status\x12\x0b\n\x07INVALID\x10\x00\x12\x0c\n\x08\x44ISABLED\x10\x01\x12\r\n\tSUSPENDED\x10\x02\x12\n\n\x06\x41\x43TIVE\x10\x03\"Q\n\x18ProjectSpecConfiguration\x12\x18\n\x0cproject_name\x18\x01 \x01(\tB\x02\x18\x01\x12\x1b\n\x13project_description\x18\x02 \x01(\t\"\xb1\x02\n\x1cModelRepositoryJFrogSettings\x12S\n\x11pull_image_secret\x18\x01 \x01(\x0b\x32\x38.qwak.projects.management.ModelRepositoryPullImageSecret\x12[\n\x15jfrog_project_details\x18\x02 \x01(\x0b\x32<.qwak.projects.management.ModelRepositoryJFrogProjectDetails\x12_\n\x1ajfrog_repositories_details\x18\x03 \x01(\x0b\x32;.qwak.projects.management.ModelRepositoryArtifactoryDetails\"@\n\x1eModelRepositoryPullImageSecret\x12\x1e\n\x16pull_image_secret_name\x18\x01 \x01(\t\"?\n\"ModelRepositoryJFrogProjectDetails\x12\x19\n\x11jfrog_project_key\x18\x01 \x01(\t\"\xb7\x02\n!ModelRepositoryArtifactoryDetails\x12[\n\x1b\x61rtifact_repository_details\x18\x01 \x01(\x0b\x32\x36.qwak.projects.management.ArtifactoryRepositoryDetails\x12Z\n\x1a\x64\x61taset_repository_details\x18\x02 \x01(\x0b\x32\x36.qwak.projects.management.ArtifactoryRepositoryDetails\x12Y\n\x19\x64ocker_repository_details\x18\x03 \x01(\x0b\x32\x36.qwak.projects.management.ArtifactoryRepositoryDetails\"6\n\x1c\x41rtifactoryRepositoryDetails\x12\x16\n\x0erepository_key\x18\x01 \x01(\t2\xc9\x04\n\x19ProjectsManagementService\x12p\n\rCreateProject\x12..qwak.projects.management.CreateProjectRequest\x1a/.qwak.projects.management.CreateProjectResponse\x12m\n\x0cListProjects\x12-.qwak.projects.management.ListProjectsRequest\x1a..qwak.projects.management.ListProjectsResponse\x12g\n\nGetProject\x12+.qwak.projects.management.GetProjectRequest\x1a,.qwak.projects.management.GetProjectResponse\x12p\n\rDeleteProject\x12..qwak.projects.management.DeleteProjectRequest\x1a/.qwak.projects.management.DeleteProjectResponse\x12p\n\rUpdateProject\x12..qwak.projects.management.UpdateProjectRequest\x1a/.qwak.projects.management.UpdateProjectResponseB\'\n#com.qwak.ai.management.projects.apiP\x01\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -27,6 +27,8 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._serialized_options = b'\n#com.qwak.ai.management.projects.apiP\001'
   _PROJECT.fields_by_name['models']._options = None
   _PROJECT.fields_by_name['models']._serialized_options = b'\030\001'
+  _PROJECTSPECCONFIGURATION.fields_by_name['project_name']._options = None
+  _PROJECTSPECCONFIGURATION.fields_by_name['project_name']._serialized_options = b'\030\001'
   _globals['_PROJECTREQUEST']._serialized_start=158
   _globals['_PROJECTREQUEST']._serialized_end=587
   _globals['_CREATEPROJECTREQUEST']._serialized_start=590
@@ -56,17 +58,17 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_PROJECTSPEC_STATUS']._serialized_start=1958
   _globals['_PROJECTSPEC_STATUS']._serialized_end=2020
   _globals['_PROJECTSPECCONFIGURATION']._serialized_start=2022
-  _globals['_PROJECTSPECCONFIGURATION']._serialized_end=2099
-  _globals['_MODELREPOSITORYJFROGSETTINGS']._serialized_start=2102
-  _globals['_MODELREPOSITORYJFROGSETTINGS']._serialized_end=2407
-  _globals['_MODELREPOSITORYPULLIMAGESECRET']._serialized_start=2409
-  _globals['_MODELREPOSITORYPULLIMAGESECRET']._serialized_end=2473
-  _globals['_MODELREPOSITORYJFROGPROJECTDETAILS']._serialized_start=2475
-  _globals['_MODELREPOSITORYJFROGPROJECTDETAILS']._serialized_end=2538
-  _globals['_MODELREPOSITORYARTIFACTORYDETAILS']._serialized_start=2541
-  _globals['_MODELREPOSITORYARTIFACTORYDETAILS']._serialized_end=2852
-  _globals['_ARTIFACTORYREPOSITORYDETAILS']._serialized_start=2854
-  _globals['_ARTIFACTORYREPOSITORYDETAILS']._serialized_end=2908
-  _globals['_PROJECTSMANAGEMENTSERVICE']._serialized_start=2911
-  _globals['_PROJECTSMANAGEMENTSERVICE']._serialized_end=3496
+  _globals['_PROJECTSPECCONFIGURATION']._serialized_end=2103
+  _globals['_MODELREPOSITORYJFROGSETTINGS']._serialized_start=2106
+  _globals['_MODELREPOSITORYJFROGSETTINGS']._serialized_end=2411
+  _globals['_MODELREPOSITORYPULLIMAGESECRET']._serialized_start=2413
+  _globals['_MODELREPOSITORYPULLIMAGESECRET']._serialized_end=2477
+  _globals['_MODELREPOSITORYJFROGPROJECTDETAILS']._serialized_start=2479
+  _globals['_MODELREPOSITORYJFROGPROJECTDETAILS']._serialized_end=2542
+  _globals['_MODELREPOSITORYARTIFACTORYDETAILS']._serialized_start=2545
+  _globals['_MODELREPOSITORYARTIFACTORYDETAILS']._serialized_end=2856
+  _globals['_ARTIFACTORYREPOSITORYDETAILS']._serialized_start=2858
+  _globals['_ARTIFACTORYREPOSITORYDETAILS']._serialized_end=2912
+  _globals['_PROJECTSMANAGEMENTSERVICE']._serialized_start=2915
+  _globals['_PROJECTSMANAGEMENTSERVICE']._serialized_end=3500
 # @@protoc_insertion_point(module_scope)

_qwak_proto/qwak/secret_service/secret_service_pb2.pyi

@@ -81,7 +81,7 @@ class DeleteSecretRequest(google.protobuf.message.Message):
 
     NAME_FIELD_NUMBER: builtins.int
     name: builtins.str
-    """The name of the secret"""
+    """Name of the secret"""
     def __init__(
         self,
         *,

qwak/__init__.py

@@ -1,7 +1,7 @@
 """Top-level package for qwak-core."""
 
 __author__ = "Qwak.ai"
-__version__ = "0.4.362"
+__version__ = "0.5.4"
 
 from qwak.inner.di_configuration import wire_dependencies
 from qwak.model.experiment_tracking import log_metric, log_param

qwak/clients/model_management/client.py

@@ -12,7 +12,6 @@ from _qwak_proto.qwak.models.models_pb2 import (
     ModelSpec,
 )
 from _qwak_proto.qwak.models.models_pb2_grpc import ModelsManagementServiceStub
-from _qwak_proto.qwak.projects.jfrog_project_spec_pb2 import ModelRepositoryJFrogSpec
 from dependency_injector.wiring import Provide
 from qwak.exceptions import QwakException
 from qwak.inner.di_configuration import QwakContainer
@@ -59,7 +58,6 @@ class ModelsManagementClient:
         project_id,
         model_name,
         model_description,
-        jfrog_project_key: Optional[str] = None,
     ):
         try:
             return self._models_management_service.CreateModel(
@@ -70,9 +68,6 @@ class ModelsManagementClient:
                         project_id=project_id,
                         model_description=model_description,
                     ),
-                    jfrog_project_spec=ModelRepositoryJFrogSpec(
-                        jfrog_project_key=jfrog_project_key,
-                    ),
                 )
             )
 

qwak/clients/project/client.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 import grpc
 from _qwak_proto.qwak.projects.projects_pb2 import (
     CreateProjectRequest,
@@ -8,7 +6,6 @@ from _qwak_proto.qwak.projects.projects_pb2 import (
     ListProjectsRequest,
 )
 from _qwak_proto.qwak.projects.projects_pb2_grpc import ProjectsManagementServiceStub
-from _qwak_proto.qwak.projects.jfrog_project_spec_pb2 import ModelRepositoryJFrogSpec
 from dependency_injector.wiring import Provide, inject
 from qwak.exceptions import QwakException
 from qwak.inner.di_configuration import QwakContainer
@@ -34,16 +31,12 @@ class ProjectsManagementClient:
         self,
         project_name,
         project_description,
-        jfrog_project_key: Optional[str] = None,
     ):
         try:
             return self._projects_management_service.CreateProject(
                 CreateProjectRequest(
                     project_name=project_name,
                     project_description=project_description,
-                    jfrog_spec=ModelRepositoryJFrogSpec(
-                        jfrog_project_key=jfrog_project_key
-                    ),
                 )
             )
 

qwak/exceptions/__init__.py

@@ -1,6 +1,7 @@
 from .quiet_error import QuietError
 from .qwak_exception import QwakException
 from .qwak_general_build_exception import QwakGeneralBuildException
+from .qwak_grpc_address_exception import QwakGrpcAddressException
 from .qwak_http_exception import QwakHTTPException
 from .qwak_inference_exception import QwakInferenceException
 from .qwak_load_configuration_exception import LoadConfigurationException

qwak/exceptions/qwak_grpc_address_exception.py

@@ -0,0 +1,9 @@
+from typing import Union
+from urllib.parse import ParseResult
+
+from qwak.exceptions import QwakException
+
+
+class QwakGrpcAddressException(QwakException):
+    def __init__(self, details: str, grpc_address: Union[str, ParseResult]):
+        self.message = f"Not a valid gRPC address: '{grpc_address}'. Details: {details}"

qwak/feature_store/_common/packaging.py

@@ -16,6 +16,7 @@ from qwak.feature_store._common.value import (
     UPDATE_QWAK_SDK_WITH_FEATURE_STORE_EXTRA_MSG,
 )
 from requests import HTTPError, Response
+from urllib.parse import urlparse, ParseResult
 
 ZIP_FUNCTION_CONTENT_TYPE = "text/plain"
 
@@ -220,17 +221,22 @@ def put_files_content(
 
 
 def upload_to_s3(presign_url: str, in_memory_zip: bytes, content_type: str) -> str:
+    parsed_url: ParseResult = urlparse(presign_url)
+    extra_headers: Dict[str, str] = (
+        {"x-ms-blob-type": "BlockBlob"}
+        if parsed_url.hostname.endswith(".blob.core.windows.net")
+        else None
+    )
     put_files_content(
         url=presign_url,
         content=in_memory_zip,
         content_type=content_type,
+        extra_headers=extra_headers,
     )
-    from urllib.parse import urlparse
 
-    parsed_url = urlparse(presign_url)
-    postfix = parsed_url.path
-    bucket = parsed_url.hostname.split(".s3.")[0]
-    s3_path = f"s3://{bucket}{postfix}"  # noqa: E231
+    postfix: str = parsed_url.path
+    bucket: str = parsed_url.hostname.split(".s3.")[0]
+    s3_path: str = f"s3://{bucket}{postfix}"  # noqa: E231
     return s3_path
 
 

qwak/inner/const.py

@@ -33,12 +33,6 @@ class QwakConstants:
 
     TOKEN_AUDIENCE: str = "https://auth-token.qwak.ai/"  # nosec B105
 
-    QWAK_AUTHENTICATION_URL = "https://grpc.qwak.ai/api/v1/authentication/qwak-api-key"
-
-    QWAK_AUTHENTICATED_USER_ENDPOINT: str = (
-        "https://grpc.qwak.ai/api/v0/runtime/get-authenticated-user-context"
-    )
-
-    JFROG_TENANT_HEADER_KEY = "X-JFrog-Tenant-Id"
-
     QWAK_APP_URL: str = "https://app.qwak.ai"
+
+    CONTROL_PLANE_GRPC_ADDRESS_ENVAR_NAME: str = "CONTROL_PLANE_GRPC_ADDRESS"

qwak/inner/di_configuration/__init__.py

@@ -1,69 +1,3 @@
-import os
-
 from .account import UserAccountConfiguration
 from .containers import QwakContainer
-
-
-def wire_dependencies():
-    container = QwakContainer()
-
-    default_config_file = os.path.join(os.path.dirname(__file__), "config.yml")
-    container.config.from_yaml(default_config_file)
-
-    from qwak.clients import (
-        administration,
-        alert_management,
-        alerts_registry,
-        analytics,
-        audience,
-        automation_management,
-        autoscaling,
-        batch_job_management,
-        build_orchestrator,
-        data_versioning,
-        deployment,
-        feature_store,
-        file_versioning,
-        instance_template,
-        integration_management,
-        kube_deployment_captain,
-        logging_client,
-        model_management,
-        project,
-        prompt_manager,
-        system_secret,
-        user_application_instance,
-        vector_store,
-        workspace_manager,
-    )
-
-    container.wire(
-        packages=[
-            administration,
-            alert_management,
-            audience,
-            automation_management,
-            autoscaling,
-            analytics,
-            batch_job_management,
-            build_orchestrator,
-            data_versioning,
-            deployment,
-            file_versioning,
-            instance_template,
-            kube_deployment_captain,
-            logging_client,
-            model_management,
-            project,
-            feature_store,
-            user_application_instance,
-            alerts_registry,
-            workspace_manager,
-            vector_store,
-            integration_management,
-            system_secret,
-            prompt_manager,
-        ]
-    )
-
-    return container
+from .dependency_wiring import wire_dependencies

qwak/inner/di_configuration/account.py

@@ -2,13 +2,12 @@ import configparser
 import errno
 import os
 from dataclasses import dataclass
-from typing import Optional, Type, Union
+from typing import Optional, Type
 
 from qwak.exceptions import QwakLoginException
 from qwak.inner.const import QwakConstants
 from qwak.inner.di_configuration.session import Session
-from qwak.inner.tool.auth import Auth0ClientBase, FrogMLAuthClient
-from frogml_storage.authentication.login import frogml_login
+from qwak.inner.tool.auth import Auth0ClientBase
 
 
 @dataclass
@@ -23,18 +22,6 @@ class UserAccount:
     # Assigned username
     username: Optional[str] = None
 
-    # Assigned password
-    password: Optional[str] = None
-
-    # Assigned URL
-    url: Optional[str] = None
-
-    # Anonymous login
-    anonymous: bool = False
-
-    # Interactive login
-    is_interactive: bool = False
-
 
 class UserAccountConfiguration:
     USER_FIELD = "user"
@@ -43,9 +30,9 @@ class UserAccountConfiguration:
 
     def __init__(
         self,
-        config_file=QwakConstants.QWAK_CONFIG_FILE,
-        auth_file=QwakConstants.QWAK_AUTHORIZATION_FILE,
-        auth_client: Union[Type[Auth0ClientBase], Type[FrogMLAuthClient]] = None,
+        config_file: str = QwakConstants.QWAK_CONFIG_FILE,
+        auth_file: str = QwakConstants.QWAK_AUTHORIZATION_FILE,
+        auth_client: Type[Auth0ClientBase] = Auth0ClientBase,
     ):
         self._config_file = config_file
         self._auth_file = auth_file
@@ -53,52 +40,12 @@ class UserAccountConfiguration:
         self._auth = configparser.ConfigParser()
         self._environment = Session().get_environment()
         self._auth_client = auth_client
-        self._force_qwak_auth = os.getenv("FORCE_QWAK_AUTH", "False") == "True"
-
-        if not self._auth_client:
-            # Determine auth client based on FrogML configuration
-            try:
-                from frogml_storage.authentication.utils import (
-                    get_frogml_configuration,
-                )
-
-                if (
-                    get_frogml_configuration() or os.getenv("JF_URL")
-                ) and not self._force_qwak_auth:
-                    self._auth_client = FrogMLAuthClient
-                else:
-                    self._auth_client = Auth0ClientBase
-            except (ImportError, Exception):
-                self._auth_client = Auth0ClientBase
 
     def configure_user(self, user_account: UserAccount):
         """
         Configure user authentication based on the authentication client type
         """
-        if issubclass(self._auth_client, Auth0ClientBase):
-            # Existing Qwak authentication flow
-            self.__qwak_login(user_account)
-
-        elif issubclass(self._auth_client, FrogMLAuthClient):
-            # Use FrogML's login flow
-            success = frogml_login(
-                url=user_account.url,
-                username=user_account.username,
-                password=user_account.password,
-                token=user_account.api_key,
-                anonymous=user_account.anonymous,
-                is_interactive=user_account.is_interactive,
-            )
-
-            if not success:
-                raise QwakLoginException("Failed to authenticate with JFrog")
-            # Validate access token
-            # TODO: Remove once we support reference token
-            token = self._auth_client().get_token()
-            if not token or len(token) <= 64:
-                raise QwakLoginException(
-                    "Authentication with JFrog failed: Only Access Tokens are supported. Please ensure you are using a valid Access Token."
-                )
+        self.__qwak_login(user_account)
 
     def __qwak_login(self, user_account: UserAccount):
         self._auth.read(self._auth_file)
@@ -139,8 +86,6 @@ class UserAccountConfiguration:
         :return:
         """
         try:
-            if issubclass(self._auth_client, FrogMLAuthClient):
-                return UserAccount()
             username = os.environ.get("QWAK_USERNAME")
             api_key = os.environ.get("QWAK_API_KEY")
             if not api_key and (
@@ -179,8 +124,6 @@ class UserAccountConfiguration:
         :return:
         """
         try:
-            if issubclass(self._auth_client, FrogMLAuthClient):
-                return ""
             api_key = os.environ.get("QWAK_API_KEY")
             if api_key:
                 Session().set_environment(api_key)
@@ -213,7 +156,4 @@ class UserAccountConfiguration:
         auth_client_instance = self._auth_client()
         base_url = auth_client_instance.get_base_url()
 
-        if issubclass(self._auth_client, FrogMLAuthClient):
-            return f"{base_url}/ui/ml"
-
         return base_url

qwak/inner/di_configuration/dependency_wiring.py

@@ -0,0 +1,98 @@
+import os
+from pathlib import Path
+from typing import Optional
+
+from qwak.inner.const import QwakConstants
+from qwak.inner.di_configuration import QwakContainer
+from qwak.inner.tool.grpc.grpc_tools import validate_grpc_address
+from qwak.tools.logger import get_qwak_logger
+
+
+logger = get_qwak_logger()
+
+__DEFAULT_CONFIG_FILE_PATH: Path = Path(__file__).parent / "config.yml"
+
+
+def wire_dependencies():
+    container = QwakContainer()
+
+    container.config.from_yaml(__DEFAULT_CONFIG_FILE_PATH)
+    control_plane_grpc_address_override: Optional[str] = os.getenv(
+        QwakConstants.CONTROL_PLANE_GRPC_ADDRESS_ENVAR_NAME
+    )
+
+    if control_plane_grpc_address_override:
+        validate_grpc_address(control_plane_grpc_address_override)
+        __override_control_plane_grpc_address(
+            container, control_plane_grpc_address_override
+        )
+
+    from qwak.clients import (
+        administration,
+        alert_management,
+        alerts_registry,
+        analytics,
+        audience,
+        automation_management,
+        autoscaling,
+        batch_job_management,
+        build_orchestrator,
+        data_versioning,
+        deployment,
+        feature_store,
+        file_versioning,
+        instance_template,
+        integration_management,
+        kube_deployment_captain,
+        logging_client,
+        model_management,
+        project,
+        prompt_manager,
+        system_secret,
+        user_application_instance,
+        vector_store,
+        workspace_manager,
+    )
+
+    container.wire(
+        packages=[
+            administration,
+            alert_management,
+            audience,
+            automation_management,
+            autoscaling,
+            analytics,
+            batch_job_management,
+            build_orchestrator,
+            data_versioning,
+            deployment,
+            file_versioning,
+            instance_template,
+            kube_deployment_captain,
+            logging_client,
+            model_management,
+            project,
+            feature_store,
+            user_application_instance,
+            alerts_registry,
+            workspace_manager,
+            vector_store,
+            integration_management,
+            system_secret,
+            prompt_manager,
+        ]
+    )
+
+    return container
+
+
+def __override_control_plane_grpc_address(
+    container: "QwakContainer", control_plane_grpc_address_override: str
+):
+    logger.debug(
+        "Overriding control plane gRPC address from environment variable to %s.",
+        control_plane_grpc_address_override,
+    )
+    container.config.grpc.core.address.from_value(
+        control_plane_grpc_address_override.strip()
+    )