reasoning-deployment-service 0.3.6__py3-none-any.whl → 0.3.8__py3-none-any.whl

reasoning_deployment_service/reasoning_deployment_service.py

@@ -1,15 +1,17 @@
 import json, os, subprocess, yaml, sys
 import urllib.parse, vertexai, google.auth
 import requests as _requests
-from typing import Tuple
+from typing import Dict, Optional, Tuple
 from pathlib import Path
 from dotenv import load_dotenv
 from vertexai import agent_engines
+from vertexai.agent_engines import AgentEngine
 from google.adk.agents import BaseAgent
 from google.auth.transport.requests import Request as GoogleAuthRequest
 from google.api_core.exceptions import NotFound
 import logging
 from datetime import datetime
+from urllib.parse import urlparse, parse_qs
 
 DISCOVERY_ENGINE_URL = "https://discoveryengine.googleapis.com/v1alpha"
 
@@ -24,7 +26,8 @@ class ReasoningEngineDeploymentService:
         self.root_agent = root_agent
         self.deployment_env = deployment_environment
         self.attempt_to_use_existing_auth = False
-        
+
+        self._cicd_deploy = False
         self._staging_bucket = None
         self._project_id = None
         self._project_number = None
@@ -101,9 +104,9 @@ class ReasoningEngineDeploymentService:
             self._generate_env_agent()
             end_run = True
         
-        if not os.path.exists("aix_agent.yaml"):
+        if not os.path.exists("agent.yaml"):
             self._generate_example_yaml_config()
-            self.warning("Creating aix_agent.yaml file ... done")
+            self.warning("Creating agent.yaml file ... done")
             end_run = True
 
         self.warning("Please fill in the required values in the generated files and re-run the deployment.")
@@ -246,7 +249,7 @@ class ReasoningEngineDeploymentService:
                 for pattern in new_patterns:
                     f.write(f"{pattern}\n")
 
-    def _generate_example_yaml_config(self, path: str | Path = "aix_agent.yaml", overwrite: bool = False) -> Path:
+    def _generate_example_yaml_config(self, path: str | Path = "agent.yaml", overwrite: bool = False) -> Path:
         """
         Create an example YAML config matching the requested schema.
 
@@ -274,7 +277,6 @@ class ReasoningEngineDeploymentService:
                     "agent_space_description": "Agent spece description, lets go",
                     "agent_space_tool_description": "Agent space tool description",
                 },
-                "agent_folder": "your_agent_folder",
                 "auth": {
                     "oauth_authorization_id": "test_auth_three",
                 },
@@ -289,11 +291,11 @@ class ReasoningEngineDeploymentService:
  
     def _load_agent_definition(self):
         try:
-            with open("aix_agent.yaml", "r") as f:
+            with open("agent.yaml", "r") as f:
                 config = yaml.safe_load(f)
         except FileNotFoundError:
             self._generate_example_yaml_config()
-            self.error("Could not locate a valid aix_agent.yaml file. Generating example file in your directory.")
+            self.error("Could not locate a valid agent.yaml file. Generating example file in your directory.")
             sys.exit(1)
 
         try:
@@ -311,7 +313,7 @@ class ReasoningEngineDeploymentService:
             agent_space_tool_description = metadata["agent_space_tool_description"]
 
             self._required_scopes = scopes
-            self._agent_folder = agent_folder
+            self._agent_folder = "agent"
             self._reasoning_engine_name = reasoning_engine_name
             self._reasoning_engine_description = reasoning_engine_description
             self._agent_space_name = agent_space_name
@@ -320,7 +322,7 @@ class ReasoningEngineDeploymentService:
             self._authorization_id = auth.get("oauth_authorization_id", None)
             self._environment_variables = environment_variables or []
         except KeyError as e:
-             raise RuntimeError(f"Missing required key in aix_agent.yaml: {e}")
+             raise RuntimeError(f"Missing required key in agent.yaml: {e}")
         
     def _load_deployment_environment_variables(self, deployment_environment: str):
         required_vars = ['PROJECT_ID', 'PROJECT_NUMBER', 'PROJECT_LOCATION', 'STAGING_BUCKET', 'AGENT_SPACE_ENGINE']
@@ -684,4 +686,203 @@ class ReasoningEngineDeploymentService:
             self.info("Creating agent space ... ")
             self._deploy_to_agent_space()
         else:
-            self._update_in_agent_space()
+            self._update_in_agent_space()
+
+
+    def _ensure_vertex_inited(self):
+        """Initialize Vertex AI once and reuse to avoid repeated heavy init calls."""
+        if not self._vertex_inited:
+            vertexai.init()
+            self._vertex_inited = True
+        
+    
+    def find_engine_by_name(self, engine_name: str) -> Optional[str]:
+        engines = list(agent_engines.list(filter=f'display_name="{engine_name}"'))
+        if not engines:
+            return None
+        if len(engines) > 1:
+            raise RuntimeError(f"Multiple engines found with display_name='{engine_name}'. Use unique names/labels.")
+        eng = engines[0]
+        if not isinstance(eng, AgentEngine) or not hasattr(eng, "resource_name"):
+            raise RuntimeError("Unexpected engine object; missing AgentEngine/resource_name.")
+        return eng.resource_name
+
+        
+    def _get_headers(self) -> dict:
+        return {
+            "Authorization": f"Bearer {self._access_token()}",
+            "Content-Type": "application/json",
+            "Accept": "application/json",
+            "X-Goog-User-Project": str(self._project_number),
+        }
+    
+    def find_authorization_by_id(self, authorization_id: str) -> Optional[str]:
+        name = f"projects/{self._project_id}/locations/global/authorizations/{authorization_id}"
+        url = f"{DISCOVERY_ENGINE_URL}/{name}"
+        r = self._http.get(url, headers=self._get_headers(), timeout=60)
+
+        if r.status_code == 404:
+            return None
+        
+        r.raise_for_status()
+        
+        return r.json().get("name", name)
+
+    def find_agent_space_agents_by_display(self, display_name: str) -> Optional[dict]:
+        base = (
+            f"{DISCOVERY_ENGINE_URL}/projects/{self._project_id}/locations/global/"
+            f"collections/default_collection/engines/{self._agent_space_engine}/"
+            f"assistants/default_assistant/agents"
+        )
+
+        headers = self._get_headers()
+        page = None
+        matches =[]
+
+        while True:
+            url = base + (f"?pageToken={page}" if page else "")
+            r = self._http.get(url, headers=headers, timeout=60)
+            r.raise_for_status()
+            data = r.json()
+
+            for a in data.get("agents", []):
+                if a.get("displayName") != display_name:
+                    continue
+                full = a.get("name", "")
+                matches.append({
+                    "id": full.split("/")[-1] if full else "",
+                    "display_name": a.get("displayName", ""),
+                    "full_name": full,
+                    "labels": a.get("labels", {}),
+                })
+
+            page = data.get("nextPageToken")
+            if not page:
+                break
+
+        if not matches:
+            return None
+        if len(matches) > 1:
+            raise RuntimeError(
+                f"Found {len(matches)} agents with displayName='{display_name}'. "
+                "Provide an ID or labels (e.g., env/app/agent) to disambiguate."
+            )
+        
+        return matches[0]
+
+
+    def one_github_deployment_to_go(self):
+        """
+        CI-friendly deploy:
+        - Engine: create or update by display_name.
+        - Authorization: create if missing; patch if scopes changed.
+        - Agent Space: create if missing; patch if found (by displayName under engine).
+        """
+        self.info("Starting GitHub deployment...")
+
+        # Ensure Vertex SDK calls have context for list/update
+        self._cicd_deploy = True
+        vertexai.init(
+            project=self._project_id,
+            location=self._project_location,
+            staging_bucket=self._staging_bucket,
+        )
+
+        # -----------------------------
+        # 1) Reasoning Engine (create or update)
+        # -----------------------------
+        engine_rn = self.find_engine_by_name(self._reasoning_engine_name)
+        if not engine_rn:
+            self.info(f"Engine '{self._reasoning_engine_name}' not found. Creating...")
+            self.create_reasoning_engine()
+            # read back the created id (or re-resolve by name as fallback)
+            engine_rn = self._read_engine_deployment_record().get("reasoning_engine_id") or \
+                        self.find_engine_by_name(self._reasoning_engine_name)
+            if not engine_rn:
+                self.error("Engine creation did not yield a resource name.")
+                raise RuntimeError("Engine creation failed.")
+        else:
+            self.info(f"Engine '{self._reasoning_engine_name}' exists. Updating...")
+            self.update_reasoning_engine(engine_rn)
+
+        # -----------------------------
+        # 2) Authorization (create if missing; update scopes if changed)
+        # -----------------------------
+        if self._authorization_id:
+            want_scopes = set(self._required_scopes or [])
+            auth_full_name = self.find_authorization_by_id(self._authorization_id)
+
+            if not auth_full_name:
+                self.info(f"Authorization '{self._authorization_id}' not found. Creating...")
+                ok = self._create_authorization()
+                if not ok:
+                    self.error("Authorization creation failed.")
+                    raise RuntimeError("Authorization creation failed.")
+                auth_full_name = self.find_authorization_by_id(self._authorization_id)
+                if not auth_full_name:
+                    self.error("Authorization creation did not resolve to a resource.")
+                    raise RuntimeError("Authorization creation failed to resolve.")
+            else:
+                # Compare scopes; patch if different
+                r = self._http.get(f"{DISCOVERY_ENGINE_URL}/{auth_full_name}",
+                                headers=self._get_headers(), timeout=60)
+                r.raise_for_status()
+                data = r.json() or {}
+                existing_uri = (((data.get("serverSideOauth2") or {}).get("authorizationUri")) or "")
+                existing_scopes = set()
+                if existing_uri:
+                    parsed = urlparse(existing_uri)
+                    qs = parse_qs(parsed.query)
+                    scope_str = (qs.get("scope", [""])[0] or "")
+                    existing_scopes = set(scope_str.split())
+
+                if existing_scopes != want_scopes:
+                    self.info("Authorization scopes changed. Patching authorization...")
+                    new_auth_uri = self._build_authorization_uri(self._oauth_client_id, list(want_scopes))
+                    patch_payload = {
+                        "serverSideOauth2": {
+                            "clientId": self._oauth_client_id,
+                            "clientSecret": self._oauth_client_secret,
+                            "authorizationUri": new_auth_uri,
+                            "tokenUri": "https://oauth2.googleapis.com/token",
+                        }
+                    }
+                    pr = self._http.patch(f"{DISCOVERY_ENGINE_URL}/{auth_full_name}",
+                                        headers=self._get_headers(), json=patch_payload, timeout=60)
+                    pr.raise_for_status()
+                    self.info("Authorization updated.")
+                else:
+                    self.info("Authorization scopes unchanged; no update needed.")
+        else:
+            self.info("No authorization_id configured; skipping authorization step.")
+
+        # -----------------------------
+        # 3) Agent Space Agent (create or update by displayName under engine)
+        # -----------------------------
+        existing_agent = self.find_agent_space_agents_by_display(self._agent_space_name)
+        headers, payload = self._get_agent_space_payload(engine_rn)
+
+        if not existing_agent:
+            self.info(f"Agent Space agent '{self._agent_space_name}' not found. Creating...")
+            create_url = self._get_agent_space_agent_url_new()
+            cr = self._http.post(create_url, headers=headers, json=payload, timeout=90)
+            if cr.status_code >= 400:
+                # File-only details already handled elsewhere; surface concise error here
+                self.error(f"Agent creation failed [{cr.status_code}].")
+                cr.raise_for_status()
+            agent_name = (cr.json() or {}).get("name")
+            if agent_name:
+                self._write_engine_deployment({"agent_space_id": agent_name})
+                self.info(f"Agent Space agent created: {agent_name}")
+            else:
+                self.warning("Agent created but response missing name. Verify in console.")
+        else:
+            self.info(f"Agent Space agent '{self._agent_space_name}' exists. Updating...")
+            patch_url = f"{DISCOVERY_ENGINE_URL}/{existing_agent['full_name']}"
+            ur = self._http.patch(patch_url, headers=headers, json=payload, timeout=90)
+            if ur.status_code >= 400:
+                self.error(f"Agent update failed [{ur.status_code}].")
+                ur.raise_for_status()
+            self.info("Agent Space agent updated.")
+
+        self.info("GitHub deployment completed successfully.")

reasoning_deployment_service/runner.py

@@ -29,8 +29,8 @@ class Runner:
         root_agent = Runner._load_agent(args.agent_path)
 
         # --- Require config files ---
-        if not Path(".env.agent").exists() or not Path("aix_agent.yaml").exists():
-            print("Missing .env.agent or aix_agent.yaml.")
+        if not Path(".env.agent").exists() or not Path("agent.yaml").exists():
+            print("Missing .env.agent or agent.yaml.")
             print("Options:\n 5) Generate placeholder config\n q) Quit")
             choice = input("Enter choice: ").strip()
             if choice == "5":
@@ -88,8 +88,7 @@ class Runner:
 
         # Case 3: bootstrap (first run)
         print("No agent path configured. Let's set it up once.")
-        agent_dir = input("Enter the directory where your root_agent (agent.py) lives: ").strip()
-        agent_dir = agent_dir.rstrip("/")
+        agent_dir = "agent"
 
         if not Path(agent_dir, "agent.py").exists():
             print(f"Error: {agent_dir}/agent.py not found")
@@ -132,6 +131,8 @@ class Runner:
             GUIEditor().run()
         elif mode == "populate_files":
             svc._check_required_files_exist()
+        elif mode == "github_deployment":
+            svc.one_github_deployment_to_go()
 
     @staticmethod
     def _menu(root_agent):

{reasoning_deployment_service-0.3.6.dist-info → reasoning_deployment_service-0.3.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reasoning-deployment-service
-Version: 0.3.6
+Version: 0.3.8
 Summary: Deployment helper for Vertex AI Reasoning Engines & Agent Spaces
 Author-email: Sergio Estrada <sergio.estrada@accenture.com>
 License: Apache-2.0
@@ -67,7 +67,7 @@ q) Quit
 - The tool will guide you to create the starter files:
   - `your_agent_import.py` (shim pointing to your agent folder)
   - `.env.agent` (environment and project settings)
-  - `aix_agent.yaml` (agent engine and space definition)
+  - `agent.yaml` (agent engine and space definition)
 
 Once these are in place, all modes will be fully available
 
@@ -83,7 +83,7 @@ Your project must have the following at minimum:
 my_project/
 ├── requirements.txt       # pinned dependencies
 ├── .env.agent             # environment and project config
-├── aix_agent.yaml         # engine and agent space definition
+├── agent.yaml         # engine and agent space definition
 ├── my_agent/              # your agent folder
 │   └── agent.py           # defines root_agent
 ```
@@ -173,7 +173,7 @@ DEVELOPER=your.name
 
 ---
 
-### ✅ aix_agent.yaml
+### ✅ agent.yaml
 
 Example starter file:
 

{reasoning_deployment_service-0.3.6.dist-info → reasoning_deployment_service-0.3.8.dist-info}/RECORD

@@ -1,6 +1,6 @@
 reasoning_deployment_service/__init__.py,sha256=xDuKt9gGviQiTV6vXBdkBvygnlAOIrwnUjVaMGZy0L4,670
-reasoning_deployment_service/reasoning_deployment_service.py,sha256=0QHU2IqqojwFI2wPJ0izrskiHiwBfxdBEB9I_YxYbSA,29133
-reasoning_deployment_service/runner.py,sha256=e2Uu4DdRWuCHQI4H1x8Q6s1eMbBNoWFkBTnAaspK1tk,5413
+reasoning_deployment_service/reasoning_deployment_service.py,sha256=FVK0xWo6CAXoFjxysDShwgBM5OJFk8WR1lDDw65E9k0,38298
+reasoning_deployment_service/runner.py,sha256=J11rdxAEAl4_xDtMrKnK-_lH3rfDcXIpvHmybQzhXvM,5381
 reasoning_deployment_service/cli_editor/__init__.py,sha256=bN8NPkw8riB92pj2lAwJZuEMOQIO_RRuge0ehnJTW1I,118
 reasoning_deployment_service/cli_editor/api_client.py,sha256=Kzx5iYp0MmowggrSmPLE7I2kt1-8xvdGBAgde9a1gCY,33681
 reasoning_deployment_service/cli_editor/cli_runner.py,sha256=1KkHtgAhVZ7VHQj7o76JibLHnr7NMUB-tieDX_KrAcY,18239
@@ -22,8 +22,8 @@ reasoning_deployment_service/gui_editor/src/ui/authorization_view.py,sha256=BoNc
 reasoning_deployment_service/gui_editor/src/ui/reasoning_engine_view.py,sha256=tCvSPEf4dW0NRdAqfs3yT5Pa873gYeLzCMMIt2r2T4o,14644
 reasoning_deployment_service/gui_editor/src/ui/reasoning_engines_view.py,sha256=IRjFlBbY98usAZa0roOonjvWQOsF6NBW4bBg_k8KnKI,7860
 reasoning_deployment_service/gui_editor/src/ui/ui_components.py,sha256=HdQHy-oSZ3GobQ3FNdH7y_w3ANbFiuf2rMoflAmff0A,55366
-reasoning_deployment_service-0.3.6.dist-info/METADATA,sha256=yn2cDwndN4bqUfVOt_kixzD3LvUD5z0XslS5-gtu7GY,5314
-reasoning_deployment_service-0.3.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-reasoning_deployment_service-0.3.6.dist-info/entry_points.txt,sha256=onGKjR5ONTtRv3aqEtK863iw9Ty1kLcjfZlsplkRZrA,84
-reasoning_deployment_service-0.3.6.dist-info/top_level.txt,sha256=GKuQS1xHUYLZbatw9DmcYdBxxLhWhhGkV4FmFxgKdp0,29
-reasoning_deployment_service-0.3.6.dist-info/RECORD,,
+reasoning_deployment_service-0.3.8.dist-info/METADATA,sha256=oJmnjcngCuNLhUHc8_Hgklk0rAVQhQwahuLI0fWX28w,5302
+reasoning_deployment_service-0.3.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+reasoning_deployment_service-0.3.8.dist-info/entry_points.txt,sha256=onGKjR5ONTtRv3aqEtK863iw9Ty1kLcjfZlsplkRZrA,84
+reasoning_deployment_service-0.3.8.dist-info/top_level.txt,sha256=GKuQS1xHUYLZbatw9DmcYdBxxLhWhhGkV4FmFxgKdp0,29
+reasoning_deployment_service-0.3.8.dist-info/RECORD,,