thestage 0.5.38__py3-none-any.whl → 0.5.40__py3-none-any.whl

thestage/.env

@@ -1,6 +1,5 @@
 THESTAGE_CONFIG_DIR=.thestage
 THESTAGE_CONFIG_FILE=config.json
-THESTAGE_CLI_ENV=DEV
-THESTAGE_API_URL=https://backend-staging.thestage.ai
-THESTAGE_API_URL=https://backend.thestage.ai
-LOG_FILE=thestage.log
+THESTAGE_API_URL=https://backend-staging3.thestage.ai
+THESTAGE_API_URL=http://localhost:8100
+LOG_FILE=thestage.log

thestage/__init__.py

@@ -1,3 +1,3 @@
 from . import *
 __app_name__ = "thestage"
-__version__ = "0.5.38"
+__version__ = "0.5.40"

thestage/controllers/config_controller.py

@@ -2,8 +2,7 @@ import os
 from pathlib import Path
 
 import click
-from thestage_core.entities.config_entity import ConfigEntity
-from thestage_core.services.filesystem_service import FileSystemServiceCore
+from thestage.services.core_files.config_entity import ConfigEntity
 
 from thestage.entities.enums.yes_no_response import YesOrNoResponse
 from thestage.i18n.translation import __
@@ -33,7 +32,7 @@ def config_get():
         typer.echo(__('No configuration found'))
         raise typer.Exit(1)
 
-    config_provider.save_global_config(config=config)
+    config_provider.save_config(config=config)
 
     typer.echo(__('THESTAGE TOKEN: %token%', {'token': config.main.thestage_auth_token or ''}))
     typer.echo(__('THESTAGE API LINK: %link%', {'link': config.main.thestage_api_url or ''}))
@@ -80,7 +79,7 @@ def config_clear():
     local_path = get_current_directory()
     config_provider = ConfigProvider(local_path=local_path)
     config_dir = config_provider.get_full_config().runtime.config_global_path
-    config_provider.remove_all_config()
+    config_provider.clear_config()
     typer.echo(f'Removed {config_dir}')
 
     raise typer.Exit(0)

thestage/controllers/container_controller.py

@@ -214,11 +214,6 @@ def put_file(
         typer.echo(__('Container unique ID is required'))
         raise typer.Exit(1)
 
-    # TODO delete when we change mappings
-    if destination_path.startswith("/app/") or destination_path == "/app":
-        typer.echo("/app/ is reserved for project code and must not contain custom files. Сonsider adding your files to the project repository")
-        raise typer.Exit(1)
-
     service_factory = validate_config_and_get_service_factory()
     config = service_factory.get_config_provider().get_full_config()
 
@@ -396,9 +391,16 @@ def stop_container(
     raise typer.Exit(0)
 
 
-@app.command(name="logs", no_args_is_help=True, help=__("Stream real-time container logs; log history is available in your TheStage AI account"))
+@app.command(name="logs", no_args_is_help=True, help=__("Stream real-time Docker container logs or view last logs for a container"))
 def container_logs(
         container_uid: Optional[str] = typer.Argument(help=__("Container unique id")),
+        logs_number: Optional[int] = typer.Option(
+            None,
+            '--number',
+            '-n',
+            help=__("Display a number of latest log entries. No real-time stream if provided."),
+            is_eager=False,
+        ),
 ):
     """
         Streams real-time container logs
@@ -412,21 +414,15 @@ def container_logs(
     service_factory = validate_config_and_get_service_factory()
     config = service_factory.get_config_provider().get_full_config()
 
-    container_service: ContainerService = service_factory.get_container_service()
     logging_service: LoggingService = service_factory.get_logging_service()
 
-    container: Optional[DockerContainerDto] = container_service.get_container(
-        config=config,
-        container_slug=container_uid,
-    )
-
-    if container:
-        logging_service.stream_container_logs(
+    if logs_number is None:
+        logging_service.stream_container_logs_with_controls(
             config=config,
-            container=container
+            container_uid=container_uid
         )
     else:
-        typer.echo(__("Container not found: %container_slug%", {'container_slug': container_uid}))
+        logging_service.print_last_container_logs(config=config, container_uid=container_uid, logs_number=logs_number)
 
     app_logger.info(f'Container logs - end')
     raise typer.Exit(0)

thestage/controllers/project_controller.py

@@ -103,11 +103,10 @@ def init(
     )
 
     typer.echo(__("Project successfully initialized at %path%", {"path": config.runtime.working_directory}))
-    typer.echo(__("Initialization complete"))
     raise typer.Exit(0)
 
 
-@app.command(name='run', no_args_is_help=True, help=__("Run task within project. By default, it uses the latest commit from the main branch and streams real-time task logs."))
+@app.command(name='run', no_args_is_help=True, help=__("Run a task within the project. By default, it uses the latest commit from the main branch and streams real-time task logs."))
 def run(
         command: Annotated[List[str], typer.Argument(
             help=__("Command to run (required)"),
@@ -141,6 +140,13 @@ def run(
             help=__("Disable real-time log streaming"),
             is_eager=False,
         ),
+        task_title: Optional[str] = typer.Option(
+            None,
+            "--title",
+            "-t",
+            help=__("Provide a custom task title. Git commit message is used by default."),
+            is_eager=False,
+        ),
 ):
     """
         Runs a task within a project
@@ -161,6 +167,7 @@ def run(
         run_command=" ".join(command),
         commit_hash=commit_hash,
         docker_container_slug=docker_container_slug,
+        task_title=task_title,
     )
 
     if enable_log_stream:
@@ -858,4 +865,4 @@ def deploy_inference_simulator_model_to_sagemaker(
         instance_type=instance_type,
         initial_variant_weight=initial_variant_weight,
         initial_instance_count=initial_instance_count,
-    )
+    )

thestage/controllers/utils_controller.py

@@ -2,8 +2,7 @@ import os
 import pathlib
 from typing import Optional, Dict, Tuple
 
-from thestage_core.entities.config_entity import ConfigEntity
-
+from thestage.services.core_files.config_entity import ConfigEntity
 from thestage.helpers.error_handler import error_handler
 from thestage.services.service_factory import ServiceFactory
 from thestage.services.config_provider.config_provider import ConfigProvider
@@ -24,6 +23,6 @@ def validate_config_and_get_service_factory(
 
     validation_service = service_factory.get_validation_service()
     validation_service.check_token(config=config)
-    config_provider.save_global_config(config=config)
+    config_provider.save_config(config=config)
 
     return service_factory

thestage/entities/file_item.py

@@ -0,0 +1,27 @@
+import os
+from pathlib import Path
+from typing import Optional, List
+
+from pydantic import BaseModel, ConfigDict, Field
+
+
+class FileItemEntity(BaseModel):
+    model_config = ConfigDict(use_enum_values=True)
+
+    name: Optional[str] = Field(None)
+    path: Optional[str] = Field(None)
+    is_file: Optional[bool] = Field(False)
+    is_folder: Optional[bool] = Field(False)
+    file_size: Optional[int] = Field(None)
+    children: List['FileItemEntity'] = Field(default=[])
+
+    @staticmethod
+    def build_from_path(path: Path) -> 'FileItemEntity':
+        file_stat = os.stat(path)
+        return FileItemEntity(
+                name=path.name,
+                path=str(path.absolute()),
+                is_file=path.is_file(),
+                is_folder=path.is_dir(),
+                file_size=file_stat.st_size,
+            )

thestage/exceptions/file_system_exception.py

@@ -0,0 +1,6 @@
+from thestage.exceptions.base_exception import BaseAbstractException
+
+
+class FileSystemException(BaseAbstractException):
+    def __init__(self, message: str):
+        super(FileSystemException, self).__init__(message=message)

thestage/helpers/error_handler.py

@@ -6,10 +6,9 @@ import typer
 from click.exceptions import Exit, Abort
 from git import GitCommandError
 from paramiko.ssh_exception import PasswordRequiredException
-from thestage_core.exceptions.file_system_exception import FileSystemException
-from thestage_core.exceptions.http_error_exception import HttpClientException
 
 from thestage.config import THESTAGE_API_URL
+from thestage.exceptions.file_system_exception import FileSystemException
 from thestage.exceptions.remote_server_exception import RemoteServerException
 from thestage.i18n.translation import __
 from thestage.exceptions.git_access_exception import GitAccessException
@@ -17,6 +16,7 @@ from thestage.exceptions.auth_exception import AuthException
 from thestage.exceptions.business_logic_exception import BusinessLogicException
 from thestage.exceptions.config_exception import ConfigException
 from thestage.helpers.logger.app_logger import app_logger
+from thestage.services.clients.thestage_api.core.http_client_exception import HttpClientException
 
 
 def error_handler() -> Callable:

thestage/helpers/logger/app_logger.py

@@ -2,13 +2,12 @@ import logging
 import platform
 from logging.handlers import RotatingFileHandler
 from pathlib import Path
-from typing import Any
 
-import typer
-from thestage_core.config import THESTAGE_CONFIG_DIR, THESTAGE_CONFIG_FILE
-from thestage_core.exceptions.file_system_exception import FileSystemException
+
+from thestage.config import THESTAGE_CONFIG_DIR
 
 from thestage.config import THESTAGE_LOGGING_FILE
+from thestage.exceptions.file_system_exception import FileSystemException
 
 
 def get_log_path_from_os() -> Path:

thestage/services/abstract_service.py

@@ -3,8 +3,7 @@ from typing import List, Dict, Any, Optional
 
 import typer
 from tabulate import tabulate
-from thestage_core.entities.config_entity import ConfigEntity
-
+from thestage.services.core_files.config_entity import ConfigEntity
 from thestage.helpers.logger.app_logger import app_logger
 from thestage.i18n.translation import __
 from thestage.services.abstract_mapper import AbstractMapper

thestage/services/app_config_service.py

@@ -2,8 +2,7 @@ import os
 
 import click
 import typer
-from thestage_core.entities.config_entity import ConfigEntity
-
+from thestage.services.core_files.config_entity import ConfigEntity
 from thestage.i18n.translation import __
 from thestage.entities.enums.yes_no_response import YesOrNoResponse
 from thestage.services.config_provider.config_provider import ConfigProvider
@@ -42,7 +41,7 @@ class AppConfigService:
         config.main.thestage_auth_token = token
 
         self.__validation_service.check_token(config=config)
-        self.__config_provider.save_global_config(config=config)
+        self.__config_provider.save_config(config=config)
 
     @staticmethod
     def app_remove_env():

thestage/services/clients/git/git_client.py

@@ -7,11 +7,11 @@ import git
 import typer
 from git import Remote, Repo, GitCommandError, Commit
 from rich import print
-from thestage_core.services.filesystem_service import FileSystemServiceCore
 
 from thestage.color_scheme.color_scheme import ColorScheme
 from thestage.exceptions.git_access_exception import GitAccessException
 from thestage.git.ProgressPrinter import ProgressPrinter
+from thestage.services.filesystem_service import FileSystemServiceCore
 
 
 class GitLocalClient:
@@ -260,8 +260,8 @@ class GitLocalClient:
             self.__file_system_service.create_if_not_exists_file(gitignore_path)
             self.git_add_by_path(repo_path=path, file_path=str(gitignore_path))
 
-        is_present_tsr = self.__file_system_service.find_in_text_file(file=str(gitignore_path),
-                                                                      find=self.__git_ignore_thestage_line)
+        is_present_tsr = self.__file_system_service.find_line_in_text_file(file=str(gitignore_path),
+                                                                           find=self.__git_ignore_thestage_line)
         if not is_present_tsr:
             self.__file_system_service.add_line_to_text_file(file=str(gitignore_path),
                                                              new_line=self.__git_ignore_thestage_line)

thestage/services/clients/thestage_api/api_client.py

@@ -2,9 +2,9 @@ from typing import Optional, List, Tuple, Dict, Iterator
 
 import httpx
 import requests
-from thestage_core.services.clients.thestage_api.api_client import TheStageApiClientCore
 
 from thestage.helpers.error_handler import error_handler
+from thestage.services.clients.thestage_api.core.api_client_core import TheStageApiClientCore
 from thestage.services.clients.thestage_api.dtos.docker_container_controller.docker_container_list_request import \
     DockerContainerListRequest
 from thestage.services.clients.thestage_api.dtos.docker_container_controller.docker_container_list_response import \
@@ -522,65 +522,6 @@ class TheStageApiClient(TheStageApiClientCore):
         return ProjectRunTaskResponse.model_validate(response) if response else None
 
 
-    def get_container_log_stream(self, token: str, container_id: int) -> Iterator[str]:
-        request_headers = {'Content-Type': 'application/json'}
-        if token: request_headers['Authorization'] = f"Bearer {token}"
-
-        session = requests.Session()
-        request = DockerContainerLogStreamRequest(
-            dockerContainerId=container_id,
-        )
-
-        with session.post(
-            url=f"{self._get_host()}/user-api/v1/logging/stream/container",
-            headers=request_headers,
-            stream=True,
-            json=request.model_dump(),
-        ) as response:
-            for line in response.iter_lines():
-                if line:
-                    yield line.decode('utf-8')
-
-
-    async def get_container_log_stream_httpx(self, token: str, container_id: int) -> Iterator[str]:
-        request_headers = {'Content-Type': 'application/json'}
-        if token: request_headers['Authorization'] = f"Bearer {token}"
-
-        request = DockerContainerLogStreamRequest(
-            dockerContainerId=container_id,
-        )
-
-        async with httpx.stream(
-            method="POST",
-            url=f"{self._get_host()}/user-api/v1/logging/stream/container",
-            headers=request_headers,
-            json=request.model_dump(),
-        ) as response:
-            async for line in response.iter_lines():
-                if line:
-                    yield line.decode('utf-8')
-
-
-    async def get_task_log_stream_httpx(self, token: str, task_id: int):
-        request_headers = {'Content-Type': 'application/json'}
-        if token: request_headers['Authorization'] = f"Bearer {token}"
-
-        request = TaskLogStreamRequest(
-            taskId=task_id,
-        )
-
-        async with httpx.AsyncClient() as client:
-            async with client.stream(
-                    method="POST",
-                    url=f"{self._get_host()}/user-api/v1/logging/stream/task",
-                    headers=request_headers,
-                    json=request.model_dump(),
-            ) as response:
-                async for line in response.aiter_lines():
-                    if line:
-                        yield line
-
-
     async def poll_logs_httpx(self, token: str, docker_container_id: Optional[int], last_log_timestamp: str, last_log_id: str, task_id: Optional[int] = None, inference_simulator_id: Optional[int] = None) -> Optional[LogPollingResponse]:
         request_headers = {'Content-Type': 'application/json'}
         if token: request_headers['Authorization'] = f"Bearer {token}"
@@ -791,10 +732,11 @@ class TheStageApiClient(TheStageApiClientCore):
         return DeployInferenceModelToSagemakerResponse.model_validate(response) if response else None
 
 
-    def query_user_logs(self, token: str, limit: int, task_id: Optional[int] = None, inference_simulator_id: Optional[int] = None) -> UserLogsQueryResponse:
+    def query_user_logs(self, token: str, limit: int, task_id: Optional[int] = None, inference_simulator_id: Optional[int] = None, container_id: Optional[int] = None) -> UserLogsQueryResponse:
         request = UserLogsQueryRequest(
             inferenceSimulatorId=inference_simulator_id,
             taskId=task_id,
+            containerId=container_id,
             limit=limit,
             ascendingOrder=False,
         )

thestage/services/clients/thestage_api/core/api_client_abstract.py

@@ -0,0 +1,91 @@
+import json
+from abc import ABC
+from typing import Optional
+
+import requests
+
+from thestage.config import THESTAGE_API_URL
+from thestage.exceptions.auth_exception import AuthException
+from thestage.services.clients.thestage_api.core.http_client_exception import HttpClientException
+
+
+class TheStageApiClientAbstract(ABC):
+    def __init__(self, timeout: int, url: Optional[str] = None):
+        self.__timeout = timeout
+        self.__api_url = url
+
+    def _get_host(self, ) -> str:
+        return self.__api_url or THESTAGE_API_URL
+
+    def _request(
+            self,
+            method: str,
+            url: str,
+            data: dict = None,
+            query_params: dict = None,
+            headers: Optional[dict] = None,
+            token: Optional[str] = None,
+    ):
+        if not data:
+            data = {}
+
+        host = self._get_host()
+        url = f'{host}{url}'
+
+        request_headers = {
+            'Content-Type': 'application/json',
+        }
+
+        if token:
+            request_headers['Authorization'] = f"Bearer {token}"
+
+        if headers:
+            request_headers.update(headers)
+        response = requests.request(
+            method=method,
+            url=url,
+            json=data,
+            params=query_params,
+            headers=request_headers,
+            timeout=self.__timeout,
+
+        )
+        return self._parse_api_response(response)
+
+    @staticmethod
+    def _parse_api_response(raw_response):
+        content_type = raw_response.headers.get('content-type')
+        message_error = None
+        if content_type == 'application/json':
+            try:
+                result = raw_response.json()
+                message_error = result.get('message', None)
+            except json.JSONDecodeError:
+                raise HttpClientException(
+                    message=f"Failed to parse server response",
+                    status_code=raw_response.status_code,
+                )
+        else:
+            result = raw_response.content.text()
+
+        if raw_response.status_code == 401:
+            raise AuthException(
+                message=f"Unauthorized",
+            )
+        elif raw_response.status_code == 403:
+            raise HttpClientException(
+                message=f"{message_error if message_error else 'Forbidden'} ({raw_response.status_code})",
+                status_code=raw_response.status_code,
+            )
+        elif raw_response.status_code >= 400:
+            raise HttpClientException(
+                message=f"{message_error if message_error else 'Request error'} ({raw_response.status_code})",
+                status_code=raw_response.status_code,
+            )
+        elif raw_response.status_code < 200 or raw_response.status_code > 300:
+            raise HttpClientException(
+                message=f"{message_error if message_error else 'Request error'} ({raw_response.status_code})",
+                status_code=raw_response.status_code,
+            )
+
+        return result

thestage/services/clients/thestage_api/core/api_client_core.py

@@ -0,0 +1,25 @@
+from typing import Optional, List, Tuple
+
+from thestage.services.clients.thestage_api.core.api_client_abstract import TheStageApiClientAbstract
+from thestage.services.clients.thestage_api.dtos.base_response import TheStageBaseResponse
+from thestage import __version__
+
+
+class TheStageApiClientCore(TheStageApiClientAbstract):
+
+    def __init__(self, timeout: int = 90, url: Optional[str] = None):
+        super(TheStageApiClientCore, self).__init__(timeout=timeout, url=url)
+
+    def validate_token(self, token: str) -> bool:
+        data = {
+            "userApiToken": token,
+            "cliVersion": __version__,
+        }
+
+        response = self._request(
+            method='POST',
+            url='/user-api/v1/validate-token',
+            data=data,
+        )
+        result = TheStageBaseResponse.model_validate(response) if response else None
+        return result.is_success if result else False

thestage/services/clients/thestage_api/core/http_client_exception.py

@@ -0,0 +1,12 @@
+from thestage.exceptions.base_exception import BaseAbstractException
+
+
+class HttpClientException(BaseAbstractException):
+    _status_code: int = 0
+
+    def __init__(self, message: str, status_code: int, ):
+        super(HttpClientException, self).__init__(message=message)
+        self._status_code = status_code
+
+    def get_status_code(self) -> int:
+        return self._status_code

thestage/services/clients/thestage_api/dtos/logging_controller/log_polling_request.py

@@ -9,5 +9,5 @@ class LogPollingRequest(BaseModel):
     taskId: Optional[int] = Field(None, alias='taskId')
     inferenceSimulatorId: Optional[int] = Field(None, alias='inferenceSimulatorId')
     lastLogId: Optional[str] = Field(None, alias='lastLogId')
-    dockerContainerId: Optional[str] = Field(None, alias='dockerContainerId')
+    dockerContainerId: Optional[int] = Field(None, alias='dockerContainerId')
     lastLogTimestamp: Optional[str] = Field(None, alias='lastLogTimestamp')

thestage/services/clients/thestage_api/dtos/project_response.py

@@ -26,8 +26,6 @@ class ProjectDto(BaseModel):
     last_task_run_date: Optional[str] = Field(None, alias='lastTaskRunDate')
     created_at: Optional[str] = Field(None, alias='createdAt')
     updated_at: Optional[str] = Field(None, alias='updatedAt')
-    instance_rented_list: List[InstanceRentedDto] = Field(default_factory=list, alias='instanceRentedList')
-    selfhosted_instance_list: List[SelfHostedInstanceDto] = Field(default_factory=list, alias='selfhostedInstanceList')
 
 
 class ProjectViewResponse(TheStageBaseResponse):

thestage/services/clients/thestage_api/dtos/sftp_path_helper.py

@@ -1,7 +1,8 @@
 from typing import Optional, List
 
-from pydantic import BaseModel, Field
-from thestage_core.entities.file_item import FileItemEntity
+from pydantic import Field
+
+from thestage.entities.file_item import FileItemEntity
 
 
 class SftpFileItemEntity(FileItemEntity):