thestage 0.5.41__tar.gz → 0.5.43__tar.gz

{thestage-0.5.41 → thestage-0.5.43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: thestage
-Version: 0.5.41
+Version: 0.5.43
 Summary: 
 Author: TheStage AI team
 Author-email: hello@thestage.ai

{thestage-0.5.41 → thestage-0.5.43}/pyproject.toml

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

{thestage-0.5.41 → thestage-0.5.43}/thestage/__init__.py

@@ -1,3 +1,3 @@
 from . import *
 __app_name__ = "thestage"
-__version__ = "0.5.41"
+__version__ = "0.5.43"

{thestage-0.5.41 → thestage-0.5.43}/thestage/color_scheme/color_scheme.py

@@ -3,3 +3,4 @@ from enum import Enum
 
 class ColorScheme(str, Enum):
     GIT_HEADLESS = "orange_red1"
+    WARNING = "orange_red1"

{thestage-0.5.41 → thestage-0.5.43}/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.43/thestage/main.py

@@ -0,0 +1,19 @@
+def main():
+    try:
+        import warnings
+        warnings.filterwarnings(action='ignore', module='.*paramiko.*')
+
+        from . import __app_name__
+
+        from thestage.controllers import base_controller, container_controller, instance_controller, project_controller, \
+            config_controller
+
+        base_controller.app.add_typer(container_controller.app, name="container")
+        base_controller.app.add_typer(instance_controller.app, name="instance")
+        base_controller.app.add_typer(project_controller.app, name="project")
+        base_controller.app.add_typer(config_controller.app, name="config")
+
+        import thestage.config
+        base_controller.app(prog_name=__app_name__)
+    except KeyboardInterrupt:
+        print('THESTAGE: Keyboard Interrupt')

{thestage-0.5.41 → thestage-0.5.43}/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.41 → thestage-0.5.43}/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.41 → thestage-0.5.43}/thestage/services/project/project_service.py

@@ -390,7 +390,7 @@ class ProjectService(AbstractService):
         )
         if run_task_response:
             if run_task_response.message:
-                typer.echo(run_task_response.message)
+                print(f"[{ColorScheme.WARNING.value}]{run_task_response.message}[{ColorScheme.WARNING.value}]")
             if run_task_response.is_success and run_task_response.task:
                 typer.echo(f"Task '{run_task_response.task.title}' has been scheduled successfully. Task ID: {run_task_response.task.id}")
                 return run_task_response.task
@@ -409,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:
@@ -543,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.41/thestage/main.py

@@ -1,18 +0,0 @@
-# temp fix to reduce annoying warnings
-import warnings
-warnings.filterwarnings(action='ignore', module='.*paramiko.*')
-
-from . import __app_name__
-
-from thestage.controllers import base_controller, container_controller, instance_controller, project_controller, \
-    config_controller
-
-base_controller.app.add_typer(container_controller.app, name="container")
-base_controller.app.add_typer(instance_controller.app, name="instance")
-base_controller.app.add_typer(project_controller.app, name="project")
-base_controller.app.add_typer(config_controller.app, name="config")
-
-
-def main():
-    import thestage.config
-    base_controller.app(prog_name=__app_name__)