tlpytools 0.2.0__tar.gz → 0.2.2__tar.gz

{tlpytools-0.2.0 → tlpytools-0.2.2}/.github/copilot-instructions.md

@@ -98,8 +98,8 @@ Interpretation for agent PRs:
 
 Observed result:
 - Build succeeds and produces:
-  - `dist/tlpytools-0.2.0.tar.gz`
-  - `dist/tlpytools-0.2.0-py3-none-any.whl`
+  - `dist/tlpytools-0.2.2.tar.gz`
+  - `dist/tlpytools-0.2.2-py3-none-any.whl`
 
 ### 5) Run
 - ORCA CLI (module form):

{tlpytools-0.2.0 → tlpytools-0.2.2}/.github/workflows/deploy.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version number to release (e.g., 0.2.0)'
+        description: 'Version number to release (e.g., 0.2.2)'
         required: true
         type: string
       prerelease:

{tlpytools-0.2.0 → tlpytools-0.2.2}/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 All notable changes to TLPyTools will be documented in this file.
 
+## [0.2.2]
+
+### Fixed
+* Fix python path leaks by cleaning up PYTHONPATH and PYTHONHOME during sub component model runs 
+* Clear stale errors when resuming or starting new runs on old scenario folders
+
+## [0.2.1]
+
+### Changed
+- **ORCA logger naming improvement:**
+  - Replaced random UUID-based logger name with a git-aware identifier resolved from the ORCA project working directory
+  - Added `_resolve_logger_name()` method to `OrcaLogger` with the following priority:
+    1. Git tag pointing at HEAD → `orca_{tag}` (e.g. `orca_v0.3.0`)
+    2. Git short SHA (first 7 characters) → `orca_{sha}` (e.g. `orca_a1b2c3d`)
+    3. Random session UUID fallback → `session_{uuid8}` (e.g. `session_03d2bb45`)
+  - Git version is resolved from `os.getcwd()` (the user's project folder) rather than the tlpytools package directory
+
 ## [0.2.0]
 
 ### Changed

{tlpytools-0.2.0 → tlpytools-0.2.2}/DEVELOPER_GUIDE.md

@@ -200,7 +200,7 @@ make check-all
 4. Click **"Run workflow"** button
 5. Fill in the required information:
    - **Branch**: Select `main` (or your release branch)
-   - **Version number**: Enter the new version (e.g., `0.2.0`)
+   - **Version number**: Enter the new version (e.g., `0.2.2`)
    - **Is this a pre-release?**: Check if this is a pre-release version
 
 #### 3. Monitor the Release
@@ -219,7 +219,7 @@ After the workflow completes:
 
 ```bash
 # Verify the package is available on PyPI
-pip install tlpytools==0.2.0  # Replace with your version
+pip install tlpytools==0.2.2  # Replace with your version
 
 # Test installation in a fresh environment
 python -c "import tlpytools; print(tlpytools.__version__)"
@@ -235,8 +235,8 @@ TLPyTools follows semantic versioning (SemVer):
 
 Examples:
 - `0.1.7` → `0.1.8` (patch release)
-- `0.1.8` → `0.2.0` (minor release)
-- `0.2.0` → `1.0.0` (major release)
+- `0.1.8` → `0.2.2` (minor release)
+- `0.2.2` → `1.0.0` (major release)
 
 ### Pre-releases
 

{tlpytools-0.2.0 → tlpytools-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tlpytools
-Version: 0.2.0
+Version: 0.2.2
 Summary: TransLink's Python Tools - A comprehensive toolkit for transportation modeling and forecasting
 Project-URL: Homepage, https://github.com/TransLinkForecasting/tlpytools
 Project-URL: Bug Tracker, https://github.com/TransLinkForecasting/tlpytools/issues

{tlpytools-0.2.0 → tlpytools-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "tlpytools"
-version = "0.2.0"
+version = "0.2.2"
 description = "TransLink's Python Tools - A comprehensive toolkit for transportation modeling and forecasting"
 readme = "README.md"
 requires-python = ">=3.10.0, <3.13"

{tlpytools-0.2.0 → tlpytools-0.2.2}/src/tlpytools/__init__.py

@@ -2,7 +2,7 @@
 TLPyTools - A set of tools for building models at the TransLink Forecasting Team
 """
 
-__version__ = "0.2.0"
+__version__ = "0.2.2"
 
 # Core modules that should always be available (minimal dependencies)
 from . import log

{tlpytools-0.2.0 → tlpytools-0.2.2}/src/tlpytools/orca/orchestrator.py

@@ -120,10 +120,8 @@ class OrcaLogger:
 
     def _setup_logger(self):
         """Set up the logger with consistent formatting and handlers."""
-        # Create a unique logger name for each instance to avoid conflicts
-        import uuid
-
-        logger_name = f"orca_{uuid.uuid4().hex[:8]}"
+        # Determine logger name from git tag, git SHA, or random session ID
+        logger_name = self._resolve_logger_name()
 
         # Create logger
         self._logger = logging.getLogger(logger_name)
@@ -172,6 +170,53 @@ class OrcaLogger:
 
         self._logger.info("=" * 80)
 
+    def _resolve_logger_name(self) -> str:
+        """
+        Resolve a stable logger name using git metadata when available.
+
+        Priority:
+        1. Git tag pointing at HEAD -> f"orca_{tag}"
+        2. Git SHA (first 7 chars)  -> f"orca_{sha}"
+        3. Random session UUID      -> f"session_{uuid8}"
+        """
+        project_cwd = os.getcwd()
+        try:
+            # Priority 1: git tag pointing exactly at HEAD
+            tag_result = subprocess.run(
+                ["git", "describe", "--tags", "--exact-match", "HEAD"],
+                capture_output=True,
+                text=True,
+                timeout=5,
+                cwd=project_cwd,
+            )
+            if tag_result.returncode == 0:
+                git_version = tag_result.stdout.strip()
+                if git_version:
+                    return f"orca_{git_version}"
+        except Exception:
+            pass
+
+        try:
+            # Priority 2: short git SHA (7 characters)
+            sha_result = subprocess.run(
+                ["git", "rev-parse", "--short=7", "HEAD"],
+                capture_output=True,
+                text=True,
+                timeout=5,
+                cwd=project_cwd,
+            )
+            if sha_result.returncode == 0:
+                git_sha = sha_result.stdout.strip()
+                if git_sha:
+                    return f"orca_{git_sha}"
+        except Exception:
+            pass
+
+        # Priority 3: random session UUID fallback
+        import uuid
+
+        return f"session_{uuid.uuid4().hex[:8]}"
+
     def _log_system_info(self):
         """
         Log detailed system information.
@@ -3692,16 +3737,15 @@ class OrcaOrchestrator:
 
                 # Create a platform-specific command to set the PYTHONPATH
                 # Use step_directory instead of os.getcwd() for consistency
+                # PYTHONHOME and PYTHONPATH are cleared first to prevent the parent
+                # Python process (e.g. Jupyter/tlpytools env) from leaking its
+                # library paths into the component subprocess
                 if os.name == "nt":  # Windows
                     # On Windows, use SET command
-                    pythonpath_cmd = (
-                        f"set PYTHONPATH={ORCA_DIR};{step_directory};%PYTHONPATH% && "
-                    )
+                    pythonpath_cmd = f"set PYTHONHOME= && set PYTHONPATH={ORCA_DIR};{step_directory} && "
                 else:  # Unix/Linux/Mac
                     # On Unix-like systems, use export command
-                    pythonpath_cmd = (
-                        f"export PYTHONPATH={ORCA_DIR}:{step_directory}:$PYTHONPATH && "
-                    )
+                    pythonpath_cmd = f"unset PYTHONHOME && export PYTHONPATH={ORCA_DIR}:{step_directory} && "
 
                 # Modify the command to ensure environment can be found
                 modified_command = f"{pythonpath_cmd}{command}"
@@ -6224,8 +6268,8 @@ class OrcaOrchestrator:
         # Reload configuration to pick up any YAML changes
         self.reload_configuration()
 
-        # Update status
-        self.state.update(status="running")
+        # Update status and clear any stale error from a previous failed run
+        self.state.update(status="running", error=None)
 
         # Add safety counter to prevent infinite loops
         max_steps = self.state.get("total_iterations", 1) * len(
@@ -6289,8 +6333,8 @@ class OrcaOrchestrator:
                 self.logger.error("Error executing step: %s", step_name)
                 return False
 
-        # Update state to reflect completion
-        self.state.update(status="completed")
+        # Update state to reflect completion and clear any previously recorded error
+        self.state.update(status="completed", error=None)
         self.logger.info("Model run completed successfully")
         return True
 
@@ -6311,8 +6355,8 @@ class OrcaOrchestrator:
         # Reload configuration to pick up any YAML changes
         self.reload_configuration()
 
-        # Update status
-        self.state.update(status="running")
+        # Update status and clear any stale error from a previous failed run
+        self.state.update(status="running", error=None)
 
         # Add safety counter to prevent infinite loops
         max_steps = self.state.get("total_iterations", 1) * len(
@@ -6392,8 +6436,8 @@ class OrcaOrchestrator:
 
                 return False
 
-        # Update state to reflect completion
-        self.state.update(status="completed")
+        # Update state to reflect completion and clear any previously recorded error
+        self.state.update(status="completed", error=None)
 
         # Final sync to cloud after completion
         self.logger.info("Final state sync to cloud after model completion")
@@ -6450,12 +6494,12 @@ class OrcaOrchestrator:
                 current_iter,
                 max_iteration,
             )
-            self.state.update(status="completed")
+            self.state.update(status="completed", error=None)
             return True
 
-        # Update status to running if not already
+        # Update status to running if not already, clearing any stale error
         if self.state.get("status") != "running":
-            self.state.update(status="running")
+            self.state.update(status="running", error=None)
 
         # Get the next step to execute
         step_name = self.state.get_next_step()
@@ -6472,7 +6516,7 @@ class OrcaOrchestrator:
             # Check if we've exceeded the total iterations
             if self.state.is_all_iterations_complete():
                 self.logger.info("All iterations completed")
-                self.state.update(status="completed")
+                self.state.update(status="completed", error=None)
                 return True
 
             # Get the first step of the new iteration
@@ -6507,7 +6551,7 @@ class OrcaOrchestrator:
 
             # Check if we just completed the last iteration
             if self.state.is_all_iterations_complete():
-                self.state.update(status="completed")
+                self.state.update(status="completed", error=None)
                 self.logger.info("Model run completed successfully")
 
             self.logger.info("Step '%s' completed successfully", step_name)
@@ -6552,12 +6596,12 @@ class OrcaOrchestrator:
                 current_iter,
                 max_iteration,
             )
-            self.state.update(status="completed")
+            self.state.update(status="completed", error=None)
             return True
 
-        # Update status to running if not already
+        # Update status to running if not already, clearing any stale error
         if self.state.get("status") != "running":
-            self.state.update(status="running")
+            self.state.update(status="running", error=None)
 
         # Remember the starting iteration
         starting_iter = self.state.get_display_iteration()
@@ -6579,7 +6623,7 @@ class OrcaOrchestrator:
 
                 # Check if we've completed all iterations
                 if self.state.is_all_iterations_complete():
-                    self.state.update(status="completed")
+                    self.state.update(status="completed", error=None)
                     self.logger.info("All iterations completed")
 
                 return True

{tlpytools-0.2.0 → tlpytools-0.2.2}/uv.lock

@@ -4601,7 +4601,7 @@ wheels = [
 
 [[package]]
 name = "tlpytools"
-version = "0.2.0"
+version = "0.2.2"
 source = { editable = "." }
 dependencies = [
     { name = "azure-core" },