convert cli to debugger of cloud infrastructure

.github/workflows/cli-deploy.yml

@@ -18,14 +18,14 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: "3.13"
 
       - name: Configure Git
         run: |
@@ -35,11 +35,11 @@ jobs:
       - name: Bump version
         run: |
           # Make bump_version.py executable
-          chmod +x bump_version.py
+          chmod +x cli/bump_version.py
 
           # Run the bump_version script with patch and commit flags
           # Use echo to automatically confirm the prompt
-          echo "y" | python bump_version.py patch --commit
+          echo "y" | python cli/bump_version.py patch --commit
 
       - name: Push changes
         run: |

.github/workflows/publish.yml

@@ -1,9 +1,6 @@
 name: Publish to PyPI
 
 on:
-  push:
-    tags:
-      - "v*"
   workflow_dispatch:
 
 permissions:
@@ -14,21 +11,25 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python
-        uses: actions/setup-python@v5
+      - name: Install uv
+        uses: astral-sh/setup-uv@v3
         with:
-          python-version: "3.11"
+          version: "latest"
+
+      - name: Set up Python
+        run: uv python install 3.13
 
-      - name: Install dependencies
+      - name: Build package
         run: |
-          python -m pip install --upgrade pip
-          pip install build twine
+          cd cli
+          uv build
 
-      - name: Build and publish
+      - name: Publish to PyPI
         env:
           TWINE_USERNAME: "__token__"
           TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
         run: |
-          python -m build
-          twine check dist/*
-          twine upload dist/*
+          cd cli
+          uv tool install twine
+          uv tool run twine check dist/*
+          uv tool run twine upload dist/*

.github/workflows/test.yml

@@ -1,10 +1,12 @@
-name: Tests
+name: CLI Tests
 
 on:
   push:
     branches: [master]
+    paths: ["cli/**"]
   pull_request:
     branches: [master]
+    paths: ["cli/**"]
 
 permissions:
   contents: read
@@ -14,26 +16,42 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.13"]
+        python-version: ["3.13"]
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v3
         with:
-          python-version: ${{ matrix.python-version }}
+          version: "latest"
+
+      - name: Set up Python ${{ matrix.python-version }}
+        run: uv python install ${{ matrix.python-version }}
+
+      - name: Install CLI package
+        run: |
+          cd cli
+          uv sync
+          uv pip install -e .
 
-      - name: Install dependencies
+      - name: Verify CLI installation
         run: |
-          python -m pip install --upgrade pip
-          pip install build twine
-          pip install -e .
+          cd cli
+          uv run infragpt --help
 
-      - name: Verify installation
+      - name: Run tests (if they exist)
         run: |
-          infragpt --help
+          cd cli
+          if [ -d "tests" ]; then
+            uv run pytest tests/ -v
+          else
+            echo "No tests directory found, skipping tests"
+          fi
 
-      - name: Check package structure
+      - name: Check package build
         run: |
-          python -m build --sdist
-          twine check dist/*
+          cd cli
+          uv build
+          uv tool install twine
+          uv tool run twine check dist/*

pyproject.toml → cli/pyproject.toml

@@ -1,6 +1,6 @@
 [build-system]
-requires = ["setuptools>=42", "wheel"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling"]
+build-backend = "hatchling.build"
 
 [project]
 name = "infragpt"
@@ -19,22 +19,26 @@ classifiers = [
     "Topic :: System :: Systems Administration",
 ]
 
-dynamic = ["dependencies"]
+dependencies = [
+    "langchain-core>=0.3.68",
+    "langchain-openai>=0.3.27",
+    "langchain-anthropic>=0.3.17",
+    "rich>=14.0.0",
+    "prompt-toolkit>=3.0.51",
+    "click>=8.2.1",
+    "pyperclip>=1.9.0",
+    "pyyaml>=6.0.2",
+]
 
 [project.urls]
 Homepage = "https://github.com/priyanshujain/infragpt"
 
 [project.scripts]
-infragpt = "cli.cli:cli"
+infragpt = "infragpt.main:cli"
 
-[tool.setuptools.packages.find]
-include = ["cli", "llm"]
 
-[tool.setuptools.dynamic]
-dependencies = { file = "requirements.txt" }
 
-[tool.uv.workspace]
-members = [
-    "services/agent",
-    "services/backend/backendapi/client/python"
+[dependency-groups]
+dev = [
+    "pytest>=8.4.1",
 ]

cli/__main__.py → cli/src/infragpt/__main__.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """Command-line entry point for InfraGPT."""
 
-from cli.cli import cli
+from infragpt.main import cli
 
 if __name__ == "__main__":
     cli()

cli/config.py → cli/src/infragpt/config.py

@@ -52,13 +52,13 @@ def init_config():
     CONFIG_DIR.mkdir(parents=True, exist_ok=True)
 
     # Initialize history directory
-    from cli.history import init_history_dir
+    from infragpt.history import init_history_dir
     init_history_dir()
 
     config = {}
 
     # Importing here to avoid circular imports
-    from cli.llm import validate_env_api_keys
+    from infragpt.llm import validate_env_api_keys
 
     # Check for environment variables to populate initial config
     openai_key = os.getenv("OPENAI_API_KEY")

llm/__init__.py → cli/src/infragpt/llm/__init__.py

@@ -10,23 +10,23 @@
 __version__ = "0.1.0"
 
 # Public exports from client.py
-from llm.client import (
+from infragpt.llm.client import (
     get_llm_client,
     generate_gcloud_command,
     get_parameter_info,
 )
 
 # Public exports from auth.py
-from llm.auth import validate_api_key
+from infragpt.llm.auth import validate_api_key
 
 # Public exports from prompts.py
-from llm.prompts import get_prompt_template, format_prompt
+from infragpt.llm.prompts import get_prompt_template, format_prompt
 
 # Public exports from models.py
-from llm.models import MODEL_TYPE
+from infragpt.llm.models import MODEL_TYPE
 
 # Public exports from errors.py
-from llm.errors import (
+from infragpt.llm.errors import (
     LLMError,
     AuthenticationError,
     GenerationError,

llm/auth.py → cli/src/infragpt/llm/auth.py

@@ -8,8 +8,8 @@
 from langchain_openai import ChatOpenAI
 from langchain_anthropic import ChatAnthropic
 
-from llm.models import MODEL_TYPE
-from llm.errors import AuthenticationError
+from infragpt.llm.models import MODEL_TYPE
+from infragpt.llm.errors import AuthenticationError
 
 
 def validate_api_key(model_type: MODEL_TYPE, api_key: str) -> bool:

llm/client.py → cli/src/infragpt/llm/client.py

@@ -13,10 +13,10 @@
 from langchain_core.output_parsers import StrOutputParser
 from langchain_core.prompts import ChatPromptTemplate
 
-from llm.models import MODEL_TYPE, MODEL_MAP, DEFAULT_PARAMS
-from llm.errors import AuthenticationError, GenerationError, ValidationError
-from llm.auth import validate_api_key
-from llm.prompts import get_prompt_template
+from infragpt.llm.models import MODEL_TYPE, MODEL_MAP, DEFAULT_PARAMS
+from infragpt.llm.errors import AuthenticationError, GenerationError, ValidationError
+from infragpt.llm.auth import validate_api_key
+from infragpt.llm.prompts import get_prompt_template
 
 
 def get_llm_client(
@@ -195,9 +195,9 @@ def get_parameter_info(
         # Re-raise authentication errors
         raise
     except json.JSONDecodeError as e:
-        from llm.errors import ParsingError
+        from infragpt.llm.errors import ParsingError
         raise ParsingError(f"Failed to parse parameter info: {str(e)}") from e
     except Exception as e:
         # Wrap other errors
-        from llm.errors import ParsingError
+        from infragpt.llm.errors import ParsingError
         raise ParsingError(f"Failed to get parameter info: {str(e)}") from e

cli/llm.py → cli/src/infragpt/llm_adapter.py

@@ -14,13 +14,13 @@
 from rich.console import Console
 from rich.prompt import Prompt
 
-from cli.config import (
+from infragpt.config import (
     CONFIG_FILE, load_config, save_config
 )
-from cli.history import log_interaction
+from infragpt.history import log_interaction
 
-# Import from shared LLM module
-from llm import (
+# Import from local LLM module
+from infragpt.llm import (
     MODEL_TYPE,
     validate_api_key as llm_validate_api_key,
     get_llm_client,

cli/cli.py → cli/src/infragpt/main.py

@@ -19,14 +19,15 @@
 except ImportError:
     pass
 
-from cli.config import (
+from infragpt.config import (
     CONFIG_FILE, load_config, init_config, console
 )
-from cli.llm import (
-    MODEL_TYPE, generate_gcloud_command, prompt_credentials, validate_env_api_keys
+from infragpt.llm.models import MODEL_TYPE
+from infragpt.llm_adapter import (
+    generate_gcloud_command, validate_env_api_keys, prompt_credentials
 )
-from cli.prompts import handle_command_result
-from cli.history import history_command
+from infragpt.prompts import handle_command_result
+from infragpt.history import history_command
 
 def interactive_mode(model_type: Optional[MODEL_TYPE] = None, api_key: Optional[str] = None, verbose: bool = False):
     """Run InfraGPT in interactive mode with natural language prompting."""

cli/prompts.py → cli/src/infragpt/prompts.py

@@ -12,12 +12,13 @@
 from rich.prompt import Prompt, Confirm
 from langchain_core.prompts import ChatPromptTemplate
 
-from cli.config import CLIPBOARD_AVAILABLE
-from cli.history import log_interaction
-from cli.llm import MODEL_TYPE, get_parameter_info
+from infragpt.config import CLIPBOARD_AVAILABLE
+from infragpt.history import log_interaction
+from infragpt.llm.models import MODEL_TYPE
+from infragpt.llm_adapter import get_parameter_info
 
-# Import from shared LLM module
-from llm.prompts import get_prompt_template
+# Import from local LLM module
+from infragpt.llm.prompts import get_prompt_template
 
 # Initialize console for rich output
 console = Console()