thestage 0.5.46__py3-none-any.whl → 0.5.49__py3-none-any.whl

thestage/services/service_factory.py

@@ -1,103 +1,97 @@
-from typing import Optional
-
-from thestage.services.connect.connect_service import ConnectService
-from thestage.services.filesystem_service import FileSystemService
-from thestage.services.logging.logging_service import LoggingService
-from thestage.services.project.project_service import ProjectService
-from thestage.services.remote_server_service import RemoteServerService
-from thestage.services.container.container_service import ContainerService
-from thestage.services.instance.instance_service import InstanceService
-from thestage.services.app_config_service import AppConfigService
-from thestage.services.clients.git.git_client import GitLocalClient
-from thestage.services.clients.thestage_api.api_client import TheStageApiClient
-from thestage.services.config_provider.config_provider import ConfigProvider
-from thestage.services.validation_service import ValidationService
-
-
-class ServiceFactory:
-    __config_provider: Optional[ConfigProvider] = None
-    __thestage_api_client: Optional[TheStageApiClient] = None
-    __git_local_client: Optional[GitLocalClient] = None
-    __file_system_service: Optional[FileSystemService] = None
-
-    def __init__(
-            self,
-            config_provider: Optional[ConfigProvider] = None,
-    ):
-        self.__config_provider = config_provider
-
-    def get_config_provider(self) -> ConfigProvider:
-        return self.__config_provider
-
-    def get_validation_service(self, config_provider: Optional[ConfigProvider] = None,) -> ValidationService:
-        return ValidationService(
-                thestage_api_client=self.get_thestage_api_client(),
-                config_provider=config_provider if config_provider else self.__config_provider,
-            )
-
-    def get_instance_service(self, config_provider: Optional[ConfigProvider] = None) -> InstanceService:
-        return InstanceService(
-                thestage_api_client=self.get_thestage_api_client(),
-                config_provider=config_provider if config_provider else self.__config_provider,
-                remote_server_service=self.get_remote_server_service(),
-            )
-
-    def get_container_service(self, config_provider: Optional[ConfigProvider] = None) -> ContainerService:
-        return ContainerService(
-                thestage_api_client=self.get_thestage_api_client(),
-                config_provider=config_provider if config_provider else self.__config_provider,
-                remote_server_service=self.get_remote_server_service(),
-                file_system_service=self.get_file_system_service(),
-            )
-
-    def get_connect_service(self, config_provider: Optional[ConfigProvider] = None) -> ConnectService:
-        return ConnectService(
-            config_provider=config_provider if config_provider else self.__config_provider,
-            thestage_api_client=self.get_thestage_api_client(),
-            instance_service=self.get_instance_service(),
-            container_service=self.get_container_service(),
-            logging_service=self.get_logging_service(),
-        )
-
-    def get_project_service(self, config_provider: Optional[ConfigProvider] = None) -> ProjectService:
-        return ProjectService(
-            thestage_api_client=self.get_thestage_api_client(),
-            config_provider=config_provider if config_provider else self.__config_provider,
-            remote_server_service=self.get_remote_server_service(),
-            file_system_service=self.get_file_system_service(),
-            git_local_client=self.get_git_local_client(),
-        )
-
-    def get_remote_server_service(self) -> RemoteServerService:
-        return RemoteServerService(
-            config_provider=self.get_config_provider(),
-            file_system_service=self.get_file_system_service(),
-        )
-
-    def get_thestage_api_client(self) -> TheStageApiClient:
-        if not self.__thestage_api_client:
-            self.__thestage_api_client = TheStageApiClient(api_url=self.__config_provider.get_full_config().main.thestage_api_url)
-        return self.__thestage_api_client
-
-    def get_git_local_client(self):
-        if not self.__git_local_client:
-            self.__git_local_client = GitLocalClient(file_system_service=self.get_file_system_service())
-        return self.__git_local_client
-
-    def get_file_system_service(self) -> FileSystemService:
-        if not self.__file_system_service:
-            self.__file_system_service = FileSystemService()
-        return self.__file_system_service
-
-    def get_app_config_service(self, config_provider: Optional[ConfigProvider] = None,) -> AppConfigService:
-        return AppConfigService(
-            validation_service=self.get_validation_service(config_provider),
-            config_provider=config_provider if config_provider else self.__config_provider,
-        )
-
-    def get_logging_service(self, config_provider: Optional[ConfigProvider] = None) -> LoggingService:
-        return LoggingService(
-            thestage_api_client=self.get_thestage_api_client(),
-            config_provider=config_provider if config_provider else self.__config_provider,
-        )
-
+from typing import Optional
+
+from thestage.services.config_provider.config_provider import ConfigProvider
+from thestage.services.connect.connect_service import ConnectService
+from thestage.services.filesystem_service import FileSystemService
+from thestage.services.logging.logging_service import LoggingService
+from thestage.services.project.project_service import ProjectService
+from thestage.services.remote_server_service import RemoteServerService
+from thestage.services.container.container_service import ContainerService
+from thestage.services.instance.instance_service import InstanceService
+from thestage.services.app_config_service import AppConfigService
+from thestage.services.clients.git.git_client import GitLocalClient
+from thestage.services.clients.thestage_api.api_client import TheStageApiClient
+from thestage.services.validation_service import ValidationService
+
+
+class ServiceFactory:
+    __thestage_api_client: Optional[TheStageApiClient] = None
+    __git_local_client: Optional[GitLocalClient] = None
+    __file_system_service: Optional[FileSystemService] = None
+    __config_provider: Optional[ConfigProvider] = None
+
+
+    def get_validation_service(self) -> ValidationService:
+        return ValidationService(
+                thestage_api_client=self.get_thestage_api_client(),
+                config_provider=self.get_config_provider(),
+            )
+
+    def get_instance_service(self) -> InstanceService:
+        return InstanceService(
+                thestage_api_client=self.get_thestage_api_client(),
+                remote_server_service=self.get_remote_server_service(),
+                config_provider=self.get_config_provider(),
+            )
+
+    def get_container_service(self) -> ContainerService:
+        return ContainerService(
+                thestage_api_client=self.get_thestage_api_client(),
+                remote_server_service=self.get_remote_server_service(),
+                file_system_service=self.get_file_system_service(),
+                config_provider=self.get_config_provider(),
+            )
+
+    def get_connect_service(self) -> ConnectService:
+        return ConnectService(
+            thestage_api_client=self.get_thestage_api_client(),
+            instance_service=self.get_instance_service(),
+            container_service=self.get_container_service(),
+            logging_service=self.get_logging_service(),
+        )
+
+    def get_project_service(self) -> ProjectService:
+        return ProjectService(
+            thestage_api_client=self.get_thestage_api_client(),
+            remote_server_service=self.get_remote_server_service(),
+            file_system_service=self.get_file_system_service(),
+            git_local_client=self.get_git_local_client(),
+            config_provider=self.get_config_provider(),
+        )
+
+    def get_remote_server_service(self) -> RemoteServerService:
+        return RemoteServerService(
+            file_system_service=self.get_file_system_service(),
+            config_provider=self.get_config_provider(),
+        )
+
+    def get_thestage_api_client(self) -> TheStageApiClient:
+        if not self.__thestage_api_client:
+            self.__thestage_api_client = TheStageApiClient(config_provider=self.get_config_provider())
+        return self.__thestage_api_client
+
+    def get_git_local_client(self):
+        if not self.__git_local_client:
+            self.__git_local_client = GitLocalClient(file_system_service=self.get_file_system_service())
+        return self.__git_local_client
+
+    def get_file_system_service(self) -> FileSystemService:
+        if not self.__file_system_service:
+            self.__file_system_service = FileSystemService()
+        return self.__file_system_service
+
+    def get_app_config_service(self) -> AppConfigService:
+        return AppConfigService(
+            config_provider=self.get_config_provider(),
+            validation_service=self.get_validation_service(),
+        )
+
+    def get_logging_service(self) -> LoggingService:
+        return LoggingService(
+            thestage_api_client=self.get_thestage_api_client(),
+        )
+
+    def get_config_provider(self) -> ConfigProvider:
+        if not self.__config_provider:
+            self.__config_provider = ConfigProvider(self.get_file_system_service())
+        return self.__config_provider

thestage/services/task/dto/task_dto.py

@@ -1,40 +1,40 @@
-from typing import Optional
-
-from pydantic import BaseModel, ConfigDict, Field
-
-from thestage.services.clients.thestage_api.dtos.container_response import DockerContainerDto
-from thestage.services.clients.thestage_api.dtos.frontend_status import FrontendStatusDto
-from thestage.services.clients.thestage_api.dtos.instance_rented_response import InstanceRentedDto
-from thestage.services.clients.thestage_api.dtos.selfhosted_instance_response import SelfHostedInstanceDto
-
-
-class TaskDto(BaseModel):
-    model_config = ConfigDict(use_enum_values=True)
-
-    id: Optional[int] = Field(None, alias='id')
-    instance_rented_id: Optional[int] = Field(None, alias='instanceRentedId')
-    selfhosted_instance_id: Optional[int] = Field(None, alias='selfhostedInstanceId')
-    docker_container_id: Optional[int] = Field(None, alias='dockerContainerId')
-    description: Optional[str] = Field(None, alias='description')
-    title: Optional[str] = Field(None, alias='title')
-    source_path: Optional[str] = Field(None, alias='sourcePath')
-    source_target_path: Optional[str] = Field(None, alias='sourceTargetPath')
-    data_path: Optional[str] = Field(None, alias='dataPath')
-    result_destination_path: Optional[str] = Field(None, alias='resultDestinationPath')
-    run_command: Optional[str] = Field(None, alias='runCommand')
-    commit_hash: Optional[str] = Field(None, alias='commitHash')
-    ordinal_number_for_sketch: Optional[int] = Field(None, alias='ordinalNumberForSketch')
-    user_id: Optional[int] = Field(None, alias='userId')
-    frontend_status: FrontendStatusDto = Field(None, alias='frontendStatus')
-    created_at: Optional[str] = Field(None, alias='createdAt')
-    updated_at: Optional[str] = Field(None, alias='updatedAt')
-    started_at: Optional[str] = Field(None, alias='startedAt')
-    finished_at: Optional[str] = Field(None, alias='finishedAt')
-    client_id: Optional[int] = Field(None, alias='clientId')
-
-    instance_rented: Optional[InstanceRentedDto] = Field(None, alias='instanceRented')
-    selfhosted_instance: Optional[SelfHostedInstanceDto] = Field(None, alias='selfhostedInstance')
-    docker_container: Optional[DockerContainerDto] = Field(None, alias='dockerContainer')
-
-    exit_code: Optional[int] = Field(None, alias='exitCode')
-    failure_reason: Optional[str] = Field(None, alias='failureReason')
+from typing import Optional
+
+from pydantic import BaseModel, ConfigDict, Field
+
+from thestage.services.clients.thestage_api.dtos.container_response import DockerContainerDto
+from thestage.services.clients.thestage_api.dtos.frontend_status import FrontendStatusDto
+from thestage.services.clients.thestage_api.dtos.instance_rented_response import InstanceRentedDto
+from thestage.services.clients.thestage_api.dtos.selfhosted_instance_response import SelfHostedInstanceDto
+
+
+class TaskDto(BaseModel):
+    model_config = ConfigDict(use_enum_values=True)
+
+    id: Optional[int] = Field(None, alias='id')
+    instance_rented_id: Optional[int] = Field(None, alias='instanceRentedId')
+    selfhosted_instance_id: Optional[int] = Field(None, alias='selfhostedInstanceId')
+    docker_container_id: Optional[int] = Field(None, alias='dockerContainerId')
+    description: Optional[str] = Field(None, alias='description')
+    title: Optional[str] = Field(None, alias='title')
+    source_path: Optional[str] = Field(None, alias='sourcePath')
+    source_target_path: Optional[str] = Field(None, alias='sourceTargetPath')
+    data_path: Optional[str] = Field(None, alias='dataPath')
+    result_destination_path: Optional[str] = Field(None, alias='resultDestinationPath')
+    run_command: Optional[str] = Field(None, alias='runCommand')
+    commit_hash: Optional[str] = Field(None, alias='commitHash')
+    ordinal_number_for_sketch: Optional[int] = Field(None, alias='ordinalNumberForSketch')
+    user_id: Optional[int] = Field(None, alias='userId')
+    frontend_status: FrontendStatusDto = Field(None, alias='frontendStatus')
+    created_at: Optional[str] = Field(None, alias='createdAt')
+    updated_at: Optional[str] = Field(None, alias='updatedAt')
+    started_at: Optional[str] = Field(None, alias='startedAt')
+    finished_at: Optional[str] = Field(None, alias='finishedAt')
+    client_id: Optional[int] = Field(None, alias='clientId')
+
+    instance_rented: Optional[InstanceRentedDto] = Field(None, alias='instanceRented')
+    selfhosted_instance: Optional[SelfHostedInstanceDto] = Field(None, alias='selfhostedInstance')
+    docker_container: Optional[DockerContainerDto] = Field(None, alias='dockerContainer')
+
+    exit_code: Optional[int] = Field(None, alias='exitCode')
+    failure_reason: Optional[str] = Field(None, alias='failureReason')

thestage/services/validation_service.py

@@ -1,56 +1,61 @@
-import typer
-
-from thestage.i18n.translation import __
-from thestage.services.config_provider.config_provider import ConfigProvider
-from thestage.services.clients.thestage_api.api_client import TheStageApiClient
-from thestage.services.core_files.config_entity import ConfigEntity
-
-
-class ValidationService:
-    _thestage_api_client: TheStageApiClient = None
-
-    def __init__(
-            self,
-            thestage_api_client: TheStageApiClient,
-            config_provider: ConfigProvider,
-    ):
-        self._thestage_api_client = thestage_api_client
-        self._config_provider = config_provider
-
-
-    def check_token(
-            self,
-            config: ConfigEntity,
-    ):
-        token = config.main.thestage_auth_token
-        if not token:
-            token: str = typer.prompt(
-                text=f'Authenticate using valid TheStage AI API token ({config.main.thestage_api_url})',
-                show_choices=False,
-                type=str,
-                show_default=False,
-            )
-
-# TODO this fails with 503 error - AttributeError("'bytes' object has no attribute 'text'") from _parse_api_response method in core
-        is_valid: bool = False
-        if token:
-            is_valid = self._thestage_api_client.validate_token(token=token)
-        if not is_valid:
-            typer.echo(__(
-                'API token is invalid: generate API token using TheStage AI WebApp'
-            ))
-            raise typer.Exit(1)
-
-        config.main.thestage_auth_token = token
-
-
-    @staticmethod
-    def is_present_token(config: ConfigEntity) -> bool:
-        present_token = True
-        if not config:
-            present_token = False
-        else:
-            if not config.main.thestage_auth_token:
-                present_token = False
-
-        return present_token
+import typer
+
+from thestage.i18n.translation import __
+# from thestage.main import update_allowed_commands
+from thestage.services.clients.thestage_api.api_client import TheStageApiClient
+from thestage.services.config_provider.config_provider import ConfigProvider
+from thestage.services.core_files.config_entity import ConfigEntity
+
+
+class ValidationService:
+    _thestage_api_client: TheStageApiClient = None
+    _config_provider: ConfigProvider = None
+
+    def __init__(
+            self,
+            thestage_api_client: TheStageApiClient,
+            config_provider: ConfigProvider,
+    ):
+        self._thestage_api_client = thestage_api_client
+        self._config_provider = config_provider
+
+
+    def check_token(self):
+        config = self._config_provider.get_config()
+        token = config.main.thestage_auth_token
+        if not token:
+            token: str = typer.prompt(
+                text=f'Authenticate using valid TheStage AI API token ({config.main.thestage_api_url})',
+                show_choices=False,
+                type=str,
+                show_default=False,
+            )
+
+# TODO this fails with 503 error - AttributeError("'bytes' object has no attribute 'text'") from _parse_api_response method in core
+        if not token:
+            return
+
+        token_validate_response = self._thestage_api_client.validate_token(token=token)
+        is_valid = token_validate_response.is_success if token_validate_response else False
+        if not is_valid:
+            typer.echo(__(
+                'API token is invalid: generate API token using TheStage AI WebApp'
+            ))
+            raise typer.Exit(1)
+
+        if config.main.thestage_auth_token != token:
+            config.main.thestage_auth_token = token
+            self._config_provider.update_config(updated_config=config)
+            self._config_provider.update_allowed_commands_and_is_token_valid(validate_token_response=token_validate_response)
+
+
+    @staticmethod
+    def is_present_token(config: ConfigEntity) -> bool:
+        present_token = True
+        if not config:
+            present_token = False
+        else:
+            if not config.main.thestage_auth_token:
+                present_token = False
+
+        return present_token

{thestage-0.5.46.dist-info → thestage-0.5.49.dist-info}/LICENSE.txt

@@ -1,13 +1,13 @@
-Copyright 2024 TheStage AI. All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
+Copyright 2024 TheStage AI. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
 limitations under the License.

{thestage-0.5.46.dist-info → thestage-0.5.49.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.1
 Name: thestage
-Version: 0.5.46
+Version: 0.5.49
 Summary: 
 Author: TheStage AI team
 Author-email: hello@thestage.ai
@@ -10,12 +10,11 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: aioconsole (>=0.8.0,<0.9.0)
 Requires-Dist: boto3 (>=1.35.80,<2.0.0)
 Requires-Dist: gitpython (>=3.1.40,<4.0.0)
 Requires-Dist: httpx (>=0.27.2,<0.28.0)
-Requires-Dist: paramiko (>=3.4.0,<4.0.0)
+Requires-Dist: paramiko (>=3.5.1,<4.0.0)
 Requires-Dist: pydantic (>=2.4.2,<3.0.0)
 Requires-Dist: python-dotenv (>=1.0.0,<2.0.0)
 Requires-Dist: python-gettext-translations (>=1.1.0,<2.0.0)