thestage 0.5.40__tar.gz → 0.5.42__tar.gz

{thestage-0.5.40 → thestage-0.5.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: thestage
-Version: 0.5.40
+Version: 0.5.42
 Summary: 
 Author: TheStage AI team
 Author-email: hello@thestage.ai

{thestage-0.5.40 → thestage-0.5.42}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "thestage"
-version = "0.5.40"
+version = "0.5.42"
 description = ""
 authors = ["TheStage AI team <hello@thestage.ai>"]
 readme = "README.md"

thestage-0.5.42/thestage/.env

@@ -0,0 +1,6 @@
+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-0.5.40 → thestage-0.5.42}/thestage/__init__.py

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

{thestage-0.5.40 → thestage-0.5.42}/thestage/controllers/config_controller.py

@@ -6,7 +6,7 @@ from thestage.services.core_files.config_entity import ConfigEntity
 
 from thestage.entities.enums.yes_no_response import YesOrNoResponse
 from thestage.i18n.translation import __
-from thestage.helpers.logger.app_logger import app_logger
+from thestage.helpers.logger.app_logger import app_logger, get_log_path_from_os
 from thestage.services.config_provider.config_provider import ConfigProvider
 from thestage.services.connect.connect_service import ConnectService
 from thestage.services.service_factory import ServiceFactory
@@ -40,6 +40,8 @@ def config_get():
     if config.runtime.config_global_path:
         typer.echo(__('CONFIG PATH: %path%', {'path': str(config.runtime.config_global_path or '') + f'/config.json'}))
 
+    typer.echo(__('APPLICATION LOGS PATH: %path%', {'path': str(get_log_path_from_os())}))
+
     raise typer.Exit(0)
 
 

{thestage-0.5.40 → thestage-0.5.42}/thestage/controllers/project_controller.py

@@ -1,7 +1,9 @@
 import time
+from pathlib import Path
 from typing import Optional, List
 
 import re
+
 import typer
 from typing_extensions import Annotated
 
@@ -425,6 +427,13 @@ def run_inference_simulator(
             help=__("Disable real-time log streaming"),
             is_eager=False,
         ),
+        is_skip_installation: Optional[bool] = typer.Option(
+            False,
+            "--skip-installation",
+            "-si",
+            help=__("Skip installing dependencies from requirements.txt and install.sh"),
+            is_eager=False,
+        ),
 ):
     """
         Run an inference simulator within a project
@@ -438,6 +447,35 @@ def run_inference_simulator(
     service_factory = validate_config_and_get_service_factory(working_directory=working_directory)
     config = service_factory.get_config_provider().get_full_config()
 
+    working_dir_path = Path(working_directory) if working_directory else Path(config.runtime.working_directory)
+    inference_files = list(working_dir_path.rglob("inference.py"))
+    if not inference_files:
+        typer.echo("No inference.py file found in the project directory.")
+        raise typer.Exit(1)
+    elif len(inference_files) == 1:
+        selected_inference = inference_files[0]
+    else:
+        choices = [str(path.relative_to(working_dir_path)) for path in inference_files]
+        typer.echo("Multiple inference.py files found:")
+        for idx, choice in enumerate(choices, start=1):
+            typer.echo(f"{idx}) {choice}")
+        choice_str = typer.prompt("Choose which inference.py to use")
+        try:
+            choice_index = int(choice_str)
+        except ValueError:
+            raise typer.BadParameter("Invalid input. Please enter a number.")
+        if not (1 <= choice_index <= len(choices)):
+            raise typer.BadParameter("Choice out of range.")
+        selected_inference = inference_files[choice_index - 1]
+
+    relative_inference = selected_inference.relative_to(working_dir_path)
+    parent_dir = relative_inference.parent
+    if parent_dir == Path("."):
+        inference_dir = "/"
+    else:
+        inference_dir = f"{parent_dir.as_posix()}/"
+    typer.echo(f"Selected inference file relative path: {inference_dir}")
+
     project_service = service_factory.get_project_service()
 
     project_service.project_run_inference_simulator(
@@ -446,6 +484,8 @@ def run_inference_simulator(
         slug=unique_id,
         rented_instance_unique_id=rented_instance_unique_id,
         self_hosted_instance_unique_id=self_hosted_instance_unique_id,
+        inference_dir=inference_dir,
+        is_skip_installation=is_skip_installation,
     )
 
     if enable_log_stream:

{thestage-0.5.40 → thestage-0.5.42}/thestage/helpers/error_handler.py

@@ -107,7 +107,8 @@ def error_handler() -> Callable:
                 else:
                     typer.echo(__('Undefined error occurred'))
                     # typer.echo(e100.__class__.__name__)
-                    print(traceback.format_exc())
+                    # print(traceback.format_exc())
+                    # TODO send all exceptions to backend?
                     app_logger.info(f'{traceback.format_exc()}')
                     raise typer.Exit(1)
         return wrapper

{thestage-0.5.40 → thestage-0.5.42}/thestage/services/clients/git/git_client.py

@@ -6,6 +6,7 @@ from typing import Optional, List
 import git
 import typer
 from git import Remote, Repo, GitCommandError, Commit
+from gitdb.exc import BadName
 from rich import print
 
 from thestage.color_scheme.color_scheme import ColorScheme
@@ -227,7 +228,10 @@ class GitLocalClient:
     def get_commit_by_hash(self, path: str, commit_hash: str) -> Optional[Commit]:
         repo = self.__get_repo(path=path)
         if repo:
-            return repo.commit(commit_hash)
+            try:
+                return repo.commit(commit_hash)
+            except BadName as ex:
+                return None
         else:
             return None
 

{thestage-0.5.40 → thestage-0.5.42}/thestage/services/clients/thestage_api/api_client.py

@@ -603,6 +603,8 @@ class TheStageApiClient(TheStageApiClientCore):
             commit_hash: Optional[str] = None,
             rented_instance_unique_id: Optional[str] = None,
             self_hosted_instance_unique_id: Optional[str] = None,
+            inference_dir: Optional[str] = None,
+            is_skip_installation: Optional[bool] = False,
     ) -> Optional[ProjectStartInferenceSimulatorResponse]:
         request = ProjectStartInferenceSimulatorRequest(
             projectSlug=project_slug,
@@ -610,6 +612,8 @@ class TheStageApiClient(TheStageApiClientCore):
             slug=slug,
             instanceRentedUId=rented_instance_unique_id,
             selfhostedInstanceUId=self_hosted_instance_unique_id,
+            inferenceDir=inference_dir,
+            isSkipInstallation=is_skip_installation,
         )
 
         response = self._request(

{thestage-0.5.40 → thestage-0.5.42}/thestage/services/clients/thestage_api/dtos/project_controller/project_start_inference_simulator_request.py

@@ -10,4 +10,6 @@ class ProjectStartInferenceSimulatorRequest(BaseModel):
     instanceRentedUId: Optional[str] = Field(None, alias='instanceRentedUId')
     selfhostedInstanceUId: Optional[str] = Field(None, alias='selfhostedInstanceUId')
     commitHash: Optional[str] = Field(None, alias='commitHash')
-    slug: Optional[str] = Field(None, alias='slug')
+    slug: Optional[str] = Field(None, alias='slug')
+    inferenceDir: Optional[str] = Field(None, alias='inferenceDir')
+    isSkipInstallation: Optional[bool] = Field(False, alias='isSkipInstallation')

thestage-0.5.42/thestage/services/logging/exception/log_polling_exception.py

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

{thestage-0.5.40 → thestage-0.5.42}/thestage/services/logging/logging_service.py

@@ -9,6 +9,7 @@ import typer
 from httpx import ReadTimeout, ConnectError, ConnectTimeout
 from requests.exceptions import ChunkedEncodingError
 
+from thestage.helpers.logger.app_logger import app_logger
 from thestage.services.clients.thestage_api.dtos.enums.container_status import DockerContainerStatus
 from thestage.services.core_files.config_entity import ConfigEntity
 from thestage.services.clients.thestage_api.dtos.enums.inference_simulator_status import InferenceSimulatorStatus
@@ -27,6 +28,7 @@ from thestage.services.clients.thestage_api.api_client import TheStageApiClient
 from thestage.services.config_provider.config_provider import ConfigProvider
 from rich import print
 
+from thestage.services.logging.exception.log_polling_exception import LogPollingException
 from thestage.services.logging.logging_constants import LOG_MESSAGE_CODE_TASK_FINISHED, \
     LOG_MESSAGE_CODE_INFERENCE_SIMULATOR_FAILED
 
@@ -302,6 +304,11 @@ class LoggingService(AbstractService):
                     last_log_id=last_log_id
                 )
 
+                if not logs_response.is_success:
+                    app_logger.info(f'Polling logs error: {logs_response.message}')
+                    raise LogPollingException('')
+
+
                 if consecutive_error_count > 0:
                     consecutive_error_count = 0
                     errors_started_at = None
@@ -323,10 +330,13 @@ class LoggingService(AbstractService):
 
                 if is_no_more_logs:
                     break
-            except (ReadTimeout, ConnectError, ConnectTimeout) as e:
+            except (ReadTimeout, ConnectError, ConnectTimeout, LogPollingException) as e:
                 consecutive_error_count += 1
                 if consecutive_error_count == 1:
-                    print_nonblocking("Network issues, attempting to re-establish connection...", writer, BytePrintStyle.ORANGE)
+                    if isinstance(e, LogPollingException):
+                        print_nonblocking("Some problems raised while getting logs...", writer, BytePrintStyle.ORANGE)
+                    else:
+                        print_nonblocking("Network issues, attempting to re-establish connection...", writer, BytePrintStyle.ORANGE)
                 if not errors_started_at:
                     errors_started_at = datetime.utcnow()
 

{thestage-0.5.40 → thestage-0.5.42}/thestage/services/project/project_service.py

@@ -367,13 +367,14 @@ class ProjectService(AbstractService):
             commit = self.__git_local_client.get_current_commit(path=config.runtime.working_directory)
             if commit and isinstance(commit, Commit):
                 commit_hash = commit.hexsha
-                if not task_title:
-                    task_title = commit.message.strip()
-        else:  # if commit_hash is defined
+
+        commit = self.__git_local_client.get_commit_by_hash(path=config.runtime.working_directory, commit_hash=commit_hash)
+        if commit and isinstance(commit, Commit):
             if not task_title:
-                commit = self.__git_local_client.get_commit_by_hash(path=config.runtime.working_directory, commit_hash=commit_hash)
-                if commit and isinstance(commit, Commit):
-                    task_title = commit.message.strip()
+                task_title = commit.message.strip()
+        else:
+            print(f'[red]Error: commit \'{commit_hash}\' was not found in the local repository[/red]')
+            raise typer.Exit(0)
 
         if not task_title:  # should not happen but maybe git allows some kind of empty messages
             task_title = f'Task_{commit_hash}'
@@ -408,6 +409,8 @@ class ProjectService(AbstractService):
             commit_hash: Optional[str] = None,
             rented_instance_unique_id: Optional[str] = None,
             self_hosted_instance_unique_id: Optional[str] = None,
+            inference_dir: Optional[str] = None,
+            is_skip_installation: Optional[bool] = False,
     ) -> Optional[InferenceSimulatorDto]:
         project_config: ProjectConfig = self.__get_fixed_project_config(config=config)
         if not project_config:
@@ -542,6 +545,8 @@ class ProjectService(AbstractService):
             slug=slug,
             rented_instance_unique_id=rented_instance_unique_id,
             self_hosted_instance_unique_id=self_hosted_instance_unique_id,
+            inference_dir=inference_dir,
+            is_skip_installation=is_skip_installation,
         )
         if start_inference_simulator_response:
             if start_inference_simulator_response.message:

thestage-0.5.40/thestage/.env

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