Refactor status action & github sync logic

Author: muellerberndt

src/actions/status.py

@@ -4,6 +4,9 @@
 from src.webhooks.server import WebhookServer
 from src.util.logging import Logger
 from src.actions.result import ActionResult
+from src.jobs.base import JobStatus
+from src.config.config import Config
+import os
 
 
 class StatusAction(BaseAction):
@@ -13,7 +16,8 @@ class StatusAction(BaseAction):
         name="status",
         description="Show system status",
         help_text="""Show the current status of the system, including:
-- Running jobs
+- Job statistics
+- Installed extensions
 - Scheduled actions
 - Webhook server status""",
         agent_hint="Use this command to check the system status",
@@ -22,29 +26,53 @@ class StatusAction(BaseAction):
 
     def __init__(self):
         self.logger = Logger("StatusAction")
+        self.config = Config()
 
     async def execute(self, *args) -> ActionResult:
         """Execute the status action"""
         try:
             lines = []
 
-            # Add running jobs section
-            lines.append("🏃 Running Jobs:")
+            # Add job statistics section
+            lines.append("📊 Job Statistics:")
             try:
-                # Get job status
                 job_manager = await JobManager.get_instance()
                 jobs = await job_manager.list_jobs()
 
-                if jobs:
-                    for job in jobs:
-                        lines.append(f"• {job['id']} ({job['type']}, status: {job['status']})")
+                # Count jobs by status
+                running = sum(1 for job in jobs if job["status"] == JobStatus.RUNNING.value)
+                completed = sum(1 for job in jobs if job["status"] == JobStatus.COMPLETED.value)
+                cancelled = sum(1 for job in jobs if job["status"] == JobStatus.CANCELLED.value)
+
+                lines.append(f"• Running: {running}")
+                lines.append(f"• Completed: {completed}")
+                lines.append(f"• Cancelled: {cancelled}")
+            except Exception as e:
+                lines.append(f"• Error getting job statistics: {str(e)}")
+
+            # Add installed extensions section
+            lines.append("\n🧩 Installed Extensions:")
+            try:
+                extensions_dir = self.config.get("extensions_dir", "./extensions")
+                if os.path.exists(extensions_dir):
+                    # Get list of directories in extensions folder
+                    extension_dirs = [
+                        d
+                        for d in os.listdir(extensions_dir)
+                        if os.path.isdir(os.path.join(extensions_dir, d)) and not d.startswith("_")
+                    ]
+                    if extension_dirs:
+                        for ext_dir in sorted(extension_dirs):
+                            lines.append(f"• {ext_dir}")
+                    else:
+                        lines.append("• No extensions installed")
                 else:
-                    lines.append("• No jobs currently running")
+                    lines.append("• Extensions directory not found")
             except Exception as e:
-                lines.append(f"• Error getting jobs: {str(e)}")
+                lines.append(f"• Error getting extensions: {str(e)}")
 
+            # Add scheduled actions section
             try:
-                # Get scheduled actions status
                 scheduler = await Scheduler.get_instance()
                 actions = scheduler.list_actions()
 
@@ -65,8 +93,8 @@ async def execute(self, *args) -> ActionResult:
             except Exception as e:
                 lines.append(f"• Error getting scheduled actions: {str(e)}")
 
+            # Add webhook server status section
             try:
-                # Get webhook status
                 webhook_server = await WebhookServer.get_instance()
                 lines.append("\n🌐 Webhook Server:")
                 if webhook_server and webhook_server.runner:

src/jobs/github_monitor.py

@@ -8,7 +8,7 @@
 from src.handlers.registry import HandlerRegistry
 import aiohttp
 from sqlalchemy import text
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timezone
 import asyncio
 from urllib.parse import urlparse
 
@@ -207,12 +207,8 @@ async def _check_repo_updates(self, repo: Dict[str, Any]) -> None:
         self.logger.info(f"Checking updates for {repo_url}")
         self.logger.debug(f"Current state: {repo}")
 
-        # Use interval * 2 for the cutoff time
-        cutoff_time = datetime.now(timezone.utc) - timedelta(seconds=self.interval * 2)
-
-        # Ensure cutoff time is timezone-aware
-        if cutoff_time.tzinfo is None:
-            cutoff_time = cutoff_time.replace(tzinfo=timezone.utc)
+        # Use last_check time from repo state (will be set to creation time for new repos)
+        cutoff_time = repo["last_check"].replace(tzinfo=timezone.utc) if repo["last_check"] else datetime.now(timezone.utc)
 
         # Check commits and PRs in parallel
         commits_task = self._get_new_commits(owner, name, cutoff_time)

src/models/github.py

@@ -15,7 +15,7 @@ class GitHubRepoState(Base):
     repo_url = Column(String, primary_key=True)  # Normalized repo URL
     last_commit_sha = Column(String)  # Last processed commit SHA
     last_pr_number = Column(Integer)  # Last processed PR number
-    last_check = Column(DateTime)  # Last time we checked this repo
+    last_check = Column(DateTime, default=datetime.utcnow)  # Last time we checked this repo
     created_at = Column(DateTime, default=datetime.utcnow)
     updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
 

src/util/db_schema.py

@@ -2,7 +2,7 @@
 from src.backend.database import db
 
 # Define allowed tables
-ALLOWED_TABLES = {"projects", "assets", "event_logs"}
+ALLOWED_TABLES = {"projects", "assets"}
 
 
 def get_table_schema() -> str:
@@ -64,8 +64,6 @@ def get_db_query_hint() -> str:
 
     examples = """
 - List projects: db_query '{"from": "projects", "order_by": [{"field": "id", "direction": "desc"}], "limit": 10}'
-- Search events: db_query '{"from": "event_logs", "order_by": [{"field": "created_at", "direction": "desc"}], "limit": 10}'
-- Filter by multiple conditions: db_query '{"from": "event_logs", "where": [{"field": "handler_name", "op": "=", "value": "ProjectEventHandler"},{"field": "created_at", "op": ">", "value": "2024-01-01"}], "limit": 10}'
 """
 
     return f"""Database Schema:

tests/actions/test_status.py

@@ -89,10 +89,10 @@ async def test_status_running_jobs(mock_job_manager, mock_scheduler, mock_webhoo
         result = await action.execute()
 
         result_str = str(result)
-        assert "🏃 Running Jobs:" in result_str
-        assert "test-job-1" in result_str
-        assert "test" in result_str
-        assert "running" in result_str
+        assert "📊 Job Statistics:" in result_str
+        assert "• Running: 1" in result_str
+        assert "• Completed: 1" in result_str
+        assert "• Cancelled: 0" in result_str
 
 
 @pytest.mark.asyncio
@@ -110,8 +110,10 @@ async def test_status_no_running_jobs(mock_job_manager, mock_scheduler, mock_web
         result = await action.execute()
 
         result_str = str(result)
-        assert "🏃 Running Jobs:" in result_str
-        assert "No jobs currently running" in result_str
+        assert "📊 Job Statistics:" in result_str
+        assert "• Running: 0" in result_str
+        assert "• Completed: 0" in result_str
+        assert "• Cancelled: 0" in result_str
 
 
 @pytest.mark.asyncio
@@ -126,9 +128,9 @@ async def test_status_scheduled_actions(mock_job_manager, mock_scheduler, mock_w
         result = await action.execute()
 
         assert "📅 Scheduled Actions:" in result
-        assert "test_action" in result
-        assert "test_command" in result
-        assert "60 minutes" in result
+        assert "✅ test_action" in result
+        assert "• Command: test_command" in result
+        assert "• Interval: 60 minutes" in result
 
 
 @pytest.mark.asyncio
@@ -143,7 +145,7 @@ async def test_status_no_scheduled_actions(mock_job_manager, mock_scheduler, moc
         action = StatusAction()
         result = await action.execute()
 
-        assert "No scheduled actions configured" in result
+        assert "• No scheduled actions configured" in result
 
 
 @pytest.mark.asyncio
@@ -158,7 +160,7 @@ async def test_status_webhook_server(mock_job_manager, mock_scheduler, mock_webh
         result = await action.execute()
 
         assert "🌐 Webhook Server:" in result
-        assert "Running on port 8080" in result
+        assert "• Running on port 8080" in result
 
 
 @pytest.mark.asyncio
@@ -173,7 +175,7 @@ async def test_status_webhook_server_not_running(mock_job_manager, mock_schedule
         action = StatusAction()
         result = await action.execute()
 
-        assert "Not running" in result
+        assert "• Not running" in result
 
 
 @pytest.mark.asyncio
@@ -191,5 +193,5 @@ async def test_status_error_handling(mock_job_manager, mock_scheduler, mock_webh
         result = await action.execute()
 
         result_str = str(result)
-        assert "🏃 Running Jobs:" in result_str
-        assert "Error getting jobs: Test error" in result_str
+        assert "📊 Job Statistics:" in result_str
+        assert "• Error getting job statistics: Test error" in result_str

tests/conftest.py

@@ -58,7 +58,7 @@
 
 # Mock engine inspection results
 mock_inspector = Mock()
-mock_inspector.get_table_names.return_value = ["projects", "assets", "event_logs"]
+mock_inspector.get_table_names.return_value = ["projects", "assets"]
 mock_inspector.get_columns.return_value = [
     {"name": "id", "type": "INTEGER", "nullable": False},
     {"name": "name", "type": "VARCHAR", "nullable": True},