thestage 0.6.1__tar.gz → 0.6.2__tar.gz

{thestage-0.6.1 → thestage-0.6.2}/PKG-INFO

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

{thestage-0.6.1 → thestage-0.6.2}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "thestage"
 
-version = "0.6.1"
+version = "0.6.2"
 
 description = ""
 authors = ["TheStage AI team <hello@thestage.ai>"]

{thestage-0.6.1 → thestage-0.6.2}/thestage/__init__.py

@@ -1,3 +1,3 @@
 from . import *
 __app_name__ = "thestage"
-__version__ = "0.6.1"
+__version__ = "0.6.2"

{thestage-0.6.1 → thestage-0.6.2}/thestage/controllers/project_controller.py

@@ -137,9 +137,16 @@ def run(
             None,
             "--files-add",
             "-fa",
-            help=__("Files to add to the commit. You can add files by their relative path from the working directory with a comma as a separator. Use '.' to add all files."),
+            help=__("Files to add to the commit. You can add files by their relative path from the working directory with a comma as a separator."),
             is_eager=False,
         ),
+        is_skip_auto_commit: Optional[bool] = typer.Option(
+            False,
+            "--skip-autocommit",
+            "-sa",
+            help=__("Skip automatic commit of the changes"),
+            is_eager=False,
+        ),        
 ):
     command_name = CliCommand.PROJECT_RUN
     app_logger.info(f'Running {command_name} from {get_current_directory()}')
@@ -158,6 +165,7 @@ def run(
         docker_container_slug=docker_container_slug,
         task_title=task_title,
         files_to_add=files_to_add,
+        is_skip_auto_commit=is_skip_auto_commit,
     )
 
     if enable_log_stream:
@@ -265,13 +273,6 @@ def checkout_project(
             help=__("Full path to working directory"),
             is_eager=False,
         ),
-        files_to_add: Optional[str] = typer.Option(
-            None,
-            "--files-add",
-            "-fa",
-            help=__("Files to add to the commit. You can add files by their relative path from the working directory with a comma as a separator. Use '.' to add all files."),
-            is_eager=False,
-        ),
 ):
     command_name = CliCommand.PROJECT_CHECKOUT
     app_logger.info(f'Running {command_name} from {get_current_directory()}')
@@ -293,7 +294,6 @@ def checkout_project(
     project_service.checkout_project(
         task_id=task_id,
         branch_name=branch_name,
-        files_to_add=files_to_add,
     )
 
     raise typer.Exit(0)
@@ -457,7 +457,14 @@ def run_inference_simulator(
             None,
             "--files-add",
             "-fa",
-            help=__("Files to add to the commit. You can add files by their relative path from the working directory with a comma as a separator. Use '.' to add all files."),
+            help=__("Files to add to the commit. You can add files by their relative path from the working directory with a comma as a separator."),
+            is_eager=False,
+        ),
+        is_skip_auto_commit: Optional[bool] = typer.Option(
+            False,
+            "--skip-autocommit",
+            "-sa",
+            help=__("Skip automatic commit of the changes"),
             is_eager=False,
         ),
 ):
@@ -506,6 +513,7 @@ def run_inference_simulator(
         inference_dir=inference_dir,
         is_skip_installation=is_skip_installation,
         files_to_add=files_to_add,
+        is_skip_auto_commit=is_skip_auto_commit,
     )
 
     if enable_log_stream:

{thestage-0.6.1 → thestage-0.6.2}/thestage/services/clients/git/git_client.py

@@ -267,7 +267,10 @@ class GitLocalClient:
         if repo:
             try:
                 diff: str = repo.git.diff("--cached", "--stat")
-                return diff.splitlines()[-1]
+                if diff:
+                    return diff.splitlines()[-1]
+                else:
+                    return None
             except ValueError as e:
                 return str(e)
 
@@ -282,10 +285,10 @@ class GitLocalClient:
         If files_to_add is not provided, adds all changed/new files except those that are too large.
         Returns True if files were added, False if operation was aborted due to large files.
         """
-        if files_to_add == '.':
-            return self.add_all_files(repo_path=repo_path, max_file_size=max_file_size)
+        if files_to_add:
+            return self.add_files_by_path(repo_path=repo_path, files_to_add=files_to_add, max_file_size=max_file_size)
 
-        return self.add_files_by_path(repo_path=repo_path, files_to_add=files_to_add, max_file_size=max_file_size)
+        return self.add_all_files(repo_path=repo_path, max_file_size=max_file_size)
 
 
     def add_files_by_path(

{thestage-0.6.1 → thestage-0.6.2}/thestage/services/project/project_service.py

@@ -233,6 +233,7 @@ class ProjectService(AbstractService):
             commit_hash: Optional[str] = None,
             docker_container_slug: Optional[str] = None,
             files_to_add: Optional[str] = None,
+            is_skip_auto_commit: Optional[bool] = False,
     ) -> Optional[TaskDto]:
         config = self.__config_provider.get_config()
         project_config: ProjectConfig = self.__get_fixed_project_config()
@@ -280,24 +281,23 @@ class ProjectService(AbstractService):
 
             self.__config_provider.save_project_config(project_config=project_config)
 
-        if files_to_add and commit_hash:
-            typer.echo(__("Cannot provide both files to add and commit hash."))
-            raise typer.Exit(1)
-        
-        has_changes = self.__git_local_client.has_changes_with_untracked(
-            path=config.runtime.working_directory,
-        )
+        has_wrong_args = files_to_add and commit_hash or is_skip_auto_commit and commit_hash or files_to_add and is_skip_auto_commit
 
-        if not files_to_add and has_changes:
-            print(f"[{ColorScheme.USEFUL_INFO.value}]Uncommitted changes detected, but the command is being run without adding these files. If you want to include these changes in the task, use the -fa flag (e.g., -fa .)[{ColorScheme.USEFUL_INFO.value}]")
+        if has_wrong_args:
+            warning_msg = f"[{ColorScheme.WARNING.value}][WARNING] You can provide only one of the following arguments: --commit-hash, --files-add, --skip-autocommit[{ColorScheme.WARNING.value}]"
+            print(warning_msg)
+            raise typer.Exit(1)
 
-        if files_to_add:
+        if not is_skip_auto_commit and not commit_hash:
             is_git_folder = self.__git_local_client.is_present_local_git(path=config.runtime.working_directory)
             if not is_git_folder:
                 typer.echo("Error: working directory does not contain git repository")
                 raise typer.Exit(1)
 
             is_commit_allowed: bool = True
+            has_changes = self.__git_local_client.has_changes_with_untracked(
+                path=config.runtime.working_directory,
+            )
 
             if self.__git_local_client.is_head_detached(path=config.runtime.working_directory):
                 is_commit_allowed = False
@@ -326,9 +326,11 @@ class ProjectService(AbstractService):
                     print(warning_msg)
                     raise typer.Exit(1)
                 
-                if has_changes:
+                diff_stat = self.__git_local_client.git_diff_stat(repo_path=config.runtime.working_directory)
+
+                if has_changes and diff_stat:
                     branch_name = self.__git_local_client.get_active_branch_name(config.runtime.working_directory)
-                    diff_stat = self.__git_local_client.git_diff_stat(repo_path=config.runtime.working_directory)
+
                     typer.echo(__('Active branch [%branch_name%] has uncommitted changes: %diff_stat_bottomline%', {
                         'diff_stat_bottomline': diff_stat,
                         'branch_name': branch_name,
@@ -433,6 +435,7 @@ class ProjectService(AbstractService):
             inference_dir: Optional[str] = None,
             is_skip_installation: Optional[bool] = False,
             files_to_add: Optional[str] = None,
+            is_skip_auto_commit: Optional[bool] = False,
     ) -> Optional[InferenceSimulatorDto]:
         config = self.__config_provider.get_config()
         project_config: ProjectConfig = self.__get_fixed_project_config()
@@ -449,24 +452,23 @@ class ProjectService(AbstractService):
             typer.echo(__("Error: Either a rented instance ID or a self-hosted instance unique ID must be provided."))
             raise typer.Exit(1)
 
-        if files_to_add and commit_hash:
-            typer.echo(__("Cannot provide both files to add and commit hash."))
-            raise typer.Exit(1)
-
-        has_changes = self.__git_local_client.has_changes_with_untracked(
-            path=config.runtime.working_directory,
-        )
+        has_wrong_args = files_to_add and commit_hash or is_skip_auto_commit and commit_hash or files_to_add and is_skip_auto_commit
 
-        if not files_to_add and has_changes:
-            print(f"[{ColorScheme.USEFUL_INFO.value}]Uncommitted changes detected, but the command is being run without adding these files. If you want to include these changes in the inference simulator, use the -fa flag (e.g., -fa .)[{ColorScheme.USEFUL_INFO.value}]")
+        if has_wrong_args:
+            warning_msg = f"[{ColorScheme.WARNING.value}][WARNING] You can provide only one of the following arguments: --commit-hash, --files-add, --skip-autocommit[{ColorScheme.WARNING.value}]"
+            print(warning_msg)
+            raise typer.Exit(1)
 
-        if files_to_add:
+        if not is_skip_auto_commit and not commit_hash:
             is_git_folder = self.__git_local_client.is_present_local_git(path=config.runtime.working_directory)
             if not is_git_folder:
                 typer.echo("Error: Working directory does not contain git repository.")
                 raise typer.Exit(1)
 
             is_commit_allowed: bool = True
+            has_changes = self.__git_local_client.has_changes_with_untracked(
+                path=config.runtime.working_directory,
+            )
 
             if self.__git_local_client.is_head_detached(path=config.runtime.working_directory):
                 print(f"[{ColorScheme.GIT_HEADLESS.value}]HEAD is detached[{ColorScheme.GIT_HEADLESS.value}]")
@@ -498,9 +500,10 @@ class ProjectService(AbstractService):
                     print(warning_msg)
                     raise typer.Exit(1)
 
-                if has_changes:
+                diff_stat = self.__git_local_client.git_diff_stat(repo_path=config.runtime.working_directory)
+
+                if has_changes and diff_stat:
                     branch_name = self.__git_local_client.get_active_branch_name(config.runtime.working_directory)
-                    diff_stat = self.__git_local_client.git_diff_stat(repo_path=config.runtime.working_directory)
                     typer.echo(__('Active branch [%branch_name%] has uncommitted changes: %diff_stat_bottomline%', {
                         'diff_stat_bottomline': diff_stat,
                         'branch_name': branch_name,
@@ -695,7 +698,6 @@ class ProjectService(AbstractService):
             self,
             task_id: Optional[int],
             branch_name: Optional[str],
-            files_to_add: Optional[str] = None,
     ):
         config = self.__config_provider.get_config()
         project_config: ProjectConfig = self.__get_fixed_project_config()
@@ -741,22 +743,13 @@ class ProjectService(AbstractService):
             if self.__git_local_client.get_active_branch_name(path=config.runtime.working_directory) == branch_name:
                 typer.echo(f"You are already at branch '{branch_name}'")
                 raise typer.Exit(0)
-
-        has_changes = self.__git_local_client.has_changes_with_untracked(
-            path=config.runtime.working_directory,
-        )
-
-        if not files_to_add and has_changes:
-            print(f"[{ColorScheme.WARNING.value}][WARNING] Uncommitted changes detected, cannot checkout with uncommitted changes. You should use the -fa flag (e.g., -fa .)[{ColorScheme.WARNING.value}]")
-            raise typer.Exit(1)
         
-        if is_commit_allowed and has_changes and files_to_add:
-            print(2)
+        if is_commit_allowed:
+            self.__git_local_client.git_add_all(repo_path=config.runtime.working_directory)
 
-            if not self.__git_local_client.add_files_with_size_limit_or_warn(config.runtime.working_directory, files_to_add):
-                warning_msg = f"[{ColorScheme.WARNING.value}][WARNING] Checkout was not performed [{ColorScheme.WARNING.value}]"
-                print(warning_msg)
-                raise typer.Exit(1)
+            has_changes = self.__git_local_client.has_changes_with_untracked(
+                path=config.runtime.working_directory,
+            )
             
             if has_changes:
                 active_branch_name = self.__git_local_client.get_active_branch_name(config.runtime.working_directory)