thestage 0.5.41__py3-none-any.whl → 0.5.43__py3-none-any.whl

thestage/__init__.py

@@ -1,3 +1,3 @@
 from . import *
 __app_name__ = "thestage"
-__version__ = "0.5.41"
+__version__ = "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/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/main.py

@@ -1,18 +1,19 @@
-# temp fix to reduce annoying warnings
-import warnings
-warnings.filterwarnings(action='ignore', module='.*paramiko.*')
-
-from . import __app_name__
+def main():
+    try:
+        import warnings
+        warnings.filterwarnings(action='ignore', module='.*paramiko.*')
 
-from thestage.controllers import base_controller, container_controller, instance_controller, project_controller, \
-    config_controller
+        from . import __app_name__
 
-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")
+        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__)
+        import thestage.config
+        base_controller.app(prog_name=__app_name__)
+    except KeyboardInterrupt:
+        print('THESTAGE: Keyboard Interrupt')

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/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/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.dist-info → thestage-0.5.43.dist-info}/METADATA

@@ -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.dist-info → thestage-0.5.43.dist-info}/RECORD

@@ -1,6 +1,6 @@
-thestage/__init__.py,sha256=VZwLTO9zP1X39kXdNyRFETyBnYYkrk_E4w1gxiko0qA,65
+thestage/__init__.py,sha256=2AyzlmhzrqADr8xt8n54FzyseX-iUutY-ndNo6UGbLg,65
 thestage/__main__.py,sha256=4ObdWrDRaIASaR06IxtFSsoMu58eyL0MnD64habvPj8,101
-thestage/color_scheme/color_scheme.py,sha256=jzdRCX0hi_XStXi4kvPHVItKlTm7dsD3fHIdeRQLeKw,87
+thestage/color_scheme/color_scheme.py,sha256=cL2SwCCCME2sy9n1ve6dakUFIENnFZCVQyvg6EAe3ew,115
 thestage/config/__init__.py,sha256=RNobilYVK1WAM1utcQ8ZuATKc9Zh9M9BAjCLZTnR_TA,428
 thestage/config/env_base.py,sha256=RNBQ17yk1ieu1kdUlM7Qe7mDCoxstgGUwwhe265o4dQ,367
 thestage/controllers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -8,7 +8,7 @@ thestage/controllers/base_controller.py,sha256=lX0XsBc7ZEPD_I56cN8IBAVuWGIkOkr7J
 thestage/controllers/config_controller.py,sha256=Gzd61UeU1igFT4QUyrZ4dOo_QaNEuXuSEIroXpbBhPA,5365
 thestage/controllers/container_controller.py,sha256=C3WC-Ypeg-vpC8LyCcPZVszbiaDYf2aQzTxYC2PPG8g,15210
 thestage/controllers/instance_controller.py,sha256=pFhkO7U2Ta0_1dzskEj8hbE7Izw_7I4SDbq5O5-bfIY,9757
-thestage/controllers/project_controller.py,sha256=M15b-VhThEhI1eOTX7r3njFnHAWK-tcLc23etOOKTj0,32527
+thestage/controllers/project_controller.py,sha256=yxYBed4fHGjw9ofQSXNg2TUPobGrFj9lb5_iHATuYfA,34274
 thestage/controllers/utils_controller.py,sha256=FV35yte7jTZRzy2DaL3OZCNzmlVrsNKxksC8P0FD7hM,1030
 thestage/debug_main.dist.py,sha256=UPIJ58yf-6FtXZj-FLAwxi7HononseuCYm9xb5KlxTs,783
 thestage/entities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -41,7 +41,7 @@ thestage/helpers/logger/app_logger.py,sha256=hUuxgUsj4pl9Ogjt1xJePTf71iVxKzyx46d
 thestage/helpers/ssh_util.py,sha256=JuDwddHxEGcA24Y8a-jLv339cG-jq4hEaBAl5TSVVFw,1262
 thestage/i18n/en_GB/messages.po,sha256=BuVIhd5TRQkgFkAbTGvbSRuO88lSJGpnk9TT2J9BC8E,32375
 thestage/i18n/translation.py,sha256=c62OicQ4phSMuqDe7hqGebIsk0W2-8ZJUfgfdtjjqEc,284
-thestage/main.py,sha256=W0Vz9qdNK44fLRQOfZoa132iHqp5spIYLdgtOE4BYqU,659
+thestage/main.py,sha256=3gHKEbOmpUTT5byvD9gPgT2uoaijAJUoa7G5dSnVlbs,784
 thestage/services/.env,sha256=K2VpzFAVjD75XawAHZdR0HWmypryA_mXNY4WHNgR-wQ,184
 thestage/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 thestage/services/abstract_mapper.py,sha256=_q7YLkPNRsNW5wOCqvZIu1KfpLkc7uVaAQKrMZtsGuY,218
@@ -52,7 +52,7 @@ thestage/services/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 thestage/services/clients/git/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 thestage/services/clients/git/git_client.py,sha256=-5WSoDj0Fi6PJD_Eo04ne83Z6IGQ85qa4eVmIsLnpb4,11737
 thestage/services/clients/thestage_api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-thestage/services/clients/thestage_api/api_client.py,sha256=BSxG6_FzoTCBub-24Hffwo6IsfAPhdzYqpfpediWucY,29396
+thestage/services/clients/thestage_api/api_client.py,sha256=FeP9ltSZqrra5j9PTy-JBIw3S-LOWG_q9CddXsmtBV4,29596
 thestage/services/clients/thestage_api/core/api_client_abstract.py,sha256=nJ0OiT4Ecexp-3HHK332pvyzrf1JsZ1WQYdvn-aeIL8,2984
 thestage/services/clients/thestage_api/core/api_client_core.py,sha256=WwtzdTAxog-l2UU8Up40BxepgM7OTXn-XHgzlHorXT0,908
 thestage/services/clients/thestage_api/core/http_client_exception.py,sha256=JH-874Gu9T1b1_FpPBLqdyt9U0PyhpwRCe_oDc6c_jI,385
@@ -116,7 +116,7 @@ thestage/services/clients/thestage_api/dtos/project_controller/project_push_infe
 thestage/services/clients/thestage_api/dtos/project_controller/project_push_inference_simulator_model_response.py,sha256=aNaD4xVkhbwlD_rI3D0-2gp-F4L6CxxUkAOSLJZPl1I,249
 thestage/services/clients/thestage_api/dtos/project_controller/project_run_task_request.py,sha256=ZFe2uGseJGwixBh380zpaotb_aWUidrqUSYoqe-y4jE,660
 thestage/services/clients/thestage_api/dtos/project_controller/project_run_task_response.py,sha256=iISmJTHbxSRJsXHT4qBTMP3-Co9fWCHI5s2UgB_-GV8,340
-thestage/services/clients/thestage_api/dtos/project_controller/project_start_inference_simulator_request.py,sha256=YtyM678EYehdCNAiwrEbWsXNsoRDtWeW1t96V7LLAFw,525
+thestage/services/clients/thestage_api/dtos/project_controller/project_start_inference_simulator_request.py,sha256=TMLXtRAy1Z66xt-XmLS-88tDwuWBA3srz6w-uAlM71U,675
 thestage/services/clients/thestage_api/dtos/project_controller/project_start_inference_simulator_response.py,sha256=Q7XlbZ4vgk9QQL2z11BeUkKDn-5p8j06eNI0GmpZNjk,430
 thestage/services/clients/thestage_api/dtos/project_response.py,sha256=PQ0L14_8akc5ADZeL_Y15Z2Hlvkt54d0YKfPROJZQHk,1691
 thestage/services/clients/thestage_api/dtos/selfhosted_instance_response.py,sha256=iDo2AFlUr2WV7vhBU40Abyp1AFoEk986UQRb5O0as4U,3049
@@ -161,13 +161,13 @@ thestage/services/project/mapper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 thestage/services/project/mapper/project_inference_simulator_mapper.py,sha256=UdOu9IIF5rlNPoWSaaeSKU3ODe8E5uSMgm2V5ywMWKE,812
 thestage/services/project/mapper/project_inference_simulator_model_mapper.py,sha256=PWY0iWbXhvD-G0X0_aQZAFY2bqc0lvRJcQAyC8Y-88Q,869
 thestage/services/project/mapper/project_task_mapper.py,sha256=SHIEXjYwt4vm2B1X2QiI4sCPbBarum0bTOnmTWPOlto,813
-thestage/services/project/project_service.py,sha256=vdHb9YB4yfw5UlOIa95M-CJLb3mQZIHn5hLhevagC5A,50666
+thestage/services/project/project_service.py,sha256=KWcYzYZL56QSoYiwkresglGeDKvYSlUXlQqBjTVAQBo,50927
 thestage/services/remote_server_service.py,sha256=3VPgd9ckxXOxXGGvb3JeJ0LwuZx2gd2jWn3Pf-CxqVk,23264
 thestage/services/service_factory.py,sha256=tWbFFDO6TeOz5jSYbe-OabqTmsjR9Xs1OZmd49Aj3g0,5098
 thestage/services/task/dto/task_dto.py,sha256=PJwrUsLLAoO2uA9xvzb27b9iYAoNiBcsHSxKERh2VFo,2335
 thestage/services/validation_service.py,sha256=ABb-ok-SGITE6jm8AR1hiYHYgGZL7ri02Yi0OCXbofo,2008
-thestage-0.5.41.dist-info/LICENSE.txt,sha256=U9QrxfdD7Ie7r8z1FleuvOGQvgCF1m0Mjd78cFvWaHE,572
-thestage-0.5.41.dist-info/METADATA,sha256=as8bA9PG2EvbCpYXW_0cGMWLSa0b6tWwE3qwawxP9h8,5557
-thestage-0.5.41.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-thestage-0.5.41.dist-info/entry_points.txt,sha256=57pMhs8zaCM-jgeTffC0WVqCsh35Uq_dUDmzXR80CI4,47
-thestage-0.5.41.dist-info/RECORD,,
+thestage-0.5.43.dist-info/LICENSE.txt,sha256=U9QrxfdD7Ie7r8z1FleuvOGQvgCF1m0Mjd78cFvWaHE,572
+thestage-0.5.43.dist-info/METADATA,sha256=rDmxq80SVJmJ-ZTPqL1TabIKTDcy7ql1t9Nll3qbP8M,5557
+thestage-0.5.43.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+thestage-0.5.43.dist-info/entry_points.txt,sha256=57pMhs8zaCM-jgeTffC0WVqCsh35Uq_dUDmzXR80CI4,47
+thestage-0.5.43.dist-info/RECORD,,