feat(ai): enhance session management, inquirer theme, and gRPC MCP support

- AI & Session Management:
  - Add random suffix to session IDs to ensure uniqueness.
  - Implement optional pagination/limit in session listing (default 20).
  - Add `--all` flag to `ai` CLI commands to view all sessions.
  - Keep active session ID and path synced correctly during clean session startups.

- CLI UI/UX:
  - Add a custom `ConnpyTheme` for inquirer prompts that dynamically translates
    active hex style colors to terminal ANSI/blessed escapes.

- gRPC & Services:
  - Implement remote MCP server listing (`list_mcp_servers` RPC and services).
  - Stream responder updates (`__RESPONDER__`) to toggle headers dynamically between
    "Network Engineer" and "Network Architect" on remote/web clients.
  - Fix remote client deadlock risk by ensuring `final_mark` is sent on exceptions.
  - Hydrate client-side chat history correctly on initial streaming request.

- Testing:
  - Add integration tests for AI gRPC services and MCP server listing.
This commit is contained in:
fluzzi32 committed 2026-05-20 12:27:02 -03:00
1 parent 468868ac18
commit dce9982454
11 files changed
+515 -319

No files matched your search

+34 -12
View File
@@ -1,4 +1,6 @@
import os
import secrets
import sys
import json
import re
@@ -165,8 +167,8 @@ class ai:
# Session Management
self.sessions_dir = os.path.join(self.config.defaultdir, "ai_sessions")
os.makedirs(self.sessions_dir, exist_ok=True)
self.session_id = None
self.session_path = None
self.session_id = getattr(self.config, "session_id", None)
self.session_path = os.path.join(self.sessions_dir, f"{self.session_id}.json") if self.session_id else None
# Prompts base agnósticos
architect_instructions = ""
@@ -877,16 +879,27 @@ class ai:
continue
return sorted(sessions, key=lambda x: x["created_at"], reverse=True)
def list_sessions(self):
def list_sessions(self, limit=20):
"""Prints a list of sessions using printer.table."""
sessions = self._get_sessions()
if not sessions:
printer.info("No saved AI sessions found.")
return
total = len(sessions)
if limit and total > limit:
sessions = sessions[:limit]
columns = ["ID", "Title", "Created At", "Model"]
rows = [[s["id"], s["title"], s["created_at"], s["model"]] for s in sessions]
printer.table("AI Persisted Sessions", columns, rows)
title = "AI Persisted Sessions"
if limit and total > limit:
title += f" (Showing last {limit} of {total})"
printer.table(title, columns, rows)
if limit and total > limit:
printer.info(f"Use '--list --all' (if supported) or check the sessions directory to see all {total} sessions.")
def load_session_data(self, session_id):
"""Loads a session's raw data by ID."""
@@ -917,8 +930,10 @@ class ai:
return sessions[0]["id"] if sessions else None
def _generate_session_id(self, query):
"""Generates a unique session ID based on timestamp."""
return datetime.datetime.now().strftime("%Y%m%d-%H%M%S")
"""Generates a unique session ID based on timestamp and a random suffix."""
ts = datetime.datetime.now().strftime("%Y%m%d-%H%M%S")
suffix = secrets.token_hex(2)
return f"{ts}-{suffix}"
def save_session(self, history, title=None, model=None):
"""Saves current history to the session file."""
@@ -927,6 +942,8 @@ class ai:
first_user_msg = next((m["content"] for m in history if m["role"] == "user"), "new-session")
self.session_id = self._generate_session_id(first_user_msg)
self.session_path = os.path.join(self.sessions_dir, f"{self.session_id}.json")
elif not self.session_path:
self.session_path = os.path.join(self.sessions_dir, f"{self.session_id}.json")
# If it's a new file, we might want to set a better title
if not os.path.exists(self.session_path) and not title:
@@ -970,10 +987,15 @@ class ai:
if chat_history is None: chat_history = []
# Load session if provided and history is empty
if session_id and not chat_history:
session_data = self.load_session_data(session_id)
if session_data:
chat_history = session_data.get("history", [])
if session_id:
# Force the session_id even if it doesn't exist yet
self.session_id = session_id
self.session_path = os.path.join(self.sessions_dir, f"{session_id}.json")
if not chat_history:
session_data = self.load_session_data(session_id)
if session_data:
chat_history = session_data.get("history", [])
# If we loaded history, the caller might need it back
# But typically ask() is called in a loop with an external history object
@@ -1058,8 +1080,8 @@ class ai:
label = "[architect][bold]Architect[/bold][/architect]" if current_brain == "architect" else "[engineer][bold]Engineer[/bold][/engineer]"
if status:
# Notify responder identity ONLY for web/remote clients (StatusBridge has is_web)
if getattr(status, "is_web", False):
# Notify responder identity for web/remote clients
if getattr(status, "is_web", False) or getattr(status, "is_remote", False):
status.update(f"__RESPONDER__:{current_brain}")
status.update(f"{label} is thinking... (step {iteration})")
+15 -8
View File
@@ -15,13 +15,22 @@ class AIHandler:
def dispatch(self, args):
if args.list_sessions:
sessions = self.app.services.ai.list_sessions()
limit = 20 if not getattr(args, "all", False) else None
sessions, total = self.app.services.ai.list_sessions(limit=limit)
if not sessions:
printer.info("No saved AI sessions found.")
return
columns = ["ID", "Title", "Created At", "Model"]
rows = [[s["id"], s["title"], s["created_at"], s["model"]] for s in sessions]
printer.table("AI Persisted Sessions", columns, rows)
title = "AI Persisted Sessions"
if limit and total > limit:
title += f" (Showing last {limit} of {total})"
printer.table(title, columns, rows)
if limit and total > limit:
printer.info(f"Use '--list --all' to see all {total} sessions.")
return
if args.delete_session:
@@ -102,7 +111,7 @@ class AIHandler:
if history:
mdprint(f"[debug]Analyzing {len(history)} previous messages...[/debug]\n")
else:
printer.error(f"Could not load session {session_id}. Starting clean.")
printer.info(f"Session '{session_id}' not found. Starting clean.")
if not history:
mdprint(Rule(style="engineer"))
@@ -116,7 +125,7 @@ class AIHandler:
if user_query.lower() in ['exit', 'quit', 'bye', 'cancel']: break
with console.status("[ai_status]Agent is thinking...") as status:
result = self.app.myai.ask(user_query, chat_history=history, status=status, debug=args.debug, trust=args.trust, **self.ai_overrides)
result = self.app.myai.ask(user_query, chat_history=history, status=status, debug=args.debug, trust=args.trust, session_id=session_id, **self.ai_overrides)
new_history = result.get("chat_history")
if new_history is not None:
@@ -147,8 +156,7 @@ class AIHandler:
action = mcp_args[0].lower()
if action == "list":
settings = self.app.services.config_svc.get_settings()
mcp_servers = settings.get("ai", {}).get("mcp_servers", {})
mcp_servers = self.app.services.ai.list_mcp_servers()
if not mcp_servers:
printer.info("No MCP servers configured.")
else:
@@ -213,8 +221,7 @@ class AIHandler:
from .forms import Forms
self.app.cli_forms = Forms(self.app)
settings = self.app.services.config_svc.get_settings()
mcp_servers = settings.get("ai", {}).get("mcp_servers", {})
mcp_servers = self.app.services.ai.list_mcp_servers()
result = self.app.cli_forms.mcp_wizard(mcp_servers)
if not result:
+72 -1
View File
@@ -1,10 +1,81 @@
import os
import inquirer
from inquirer.themes import Default, term
try:
from pyfzf.pyfzf import FzfPrompt
except ImportError:
FzfPrompt = None
def hex_to_blessed(hex_str):
"""Convert hex color string to blessed/ansi format."""
if not hex_str or not isinstance(hex_str, str):
return term.normal
# Check for bold prefix
prefix = ""
if hex_str.startswith('bold '):
prefix = term.bold
hex_str = hex_str.replace('bold ', '').strip()
# If it's a standard color name
if not hex_str.startswith('#'):
return prefix + getattr(term, hex_str, term.normal)
# Parse hex
try:
h = hex_str.lstrip('#')
if len(h) == 3:
h = ''.join([c*2 for c in h])
r = int(h[0:2], 16)
g = int(h[2:4], 16)
b = int(h[4:6], 16)
# Try RGB, fallback to standard cyan if it fails or returns empty
try:
c = term.color_rgb(r, g, b)
if not c: # Some terms return empty for RGB
return prefix + term.cyan
return prefix + c
except:
return prefix + term.cyan
except:
return prefix + term.normal
# Custom inquirer theme matching connpy colors
class ConnpyTheme(Default):
def __init__(self):
super().__init__()
try:
from ..printer import _global_active_styles
# Use user_prompt as primary accent, fallback to info/cyan
accent = _global_active_styles.get("user_prompt", _global_active_styles.get("info", "cyan"))
accent_color = hex_to_blessed(accent)
self.Question.mark_color = accent_color
self.List.selection_color = accent_color
self.List.selection_cursor = ">"
except:
# Absolute fallback to standard cyan
self.Question.mark_color = term.cyan
self.List.selection_color = term.bold_cyan
self.List.selection_cursor = ">"
def get_theme():
"""Returns a fresh instance of the theme with current colors."""
return ConnpyTheme()
class ThemeProxy:
"""Proxy to ensure theme colors are resolved at runtime."""
def __getattr__(self, name):
return getattr(get_theme(), name)
def __iter__(self):
return iter(get_theme())
def __getitem__(self, item):
return get_theme()[item]
theme = ThemeProxy()
def get_config_dir():
home = os.path.expanduser("~")
defaultdir = os.path.join(home, '.config/conn')
@@ -56,7 +127,7 @@ def choose(app, list_, name, action):
return answer[0]
else:
questions = [inquirer.List(name, message="Pick {} to {}:".format(name,action), choices=list_, carousel=True)]
answer = inquirer.prompt(questions)
answer = inquirer.prompt(questions, theme=theme)
if answer == None:
return None
else:
+1
View File
@@ -281,6 +281,7 @@ class connapp:
aiparser.add_argument("--debug", action="store_true", help="Show AI reasoning and tool calls")
aiparser.add_argument("-y", "--trust", action="store_true", help="Trust AI to execute unsafe commands without confirmation")
aiparser.add_argument("--list", "--list-sessions", dest="list_sessions", action="store_true", help="List saved AI sessions")
aiparser.add_argument("--all", action="store_true", help="Show all sessions without limit")
aiparser.add_argument("--session", nargs=1, help="Resume a specific AI session by ID")
aiparser.add_argument("--resume", action="store_true", help="Resume the most recent AI session")
aiparser.add_argument("--delete", "--delete-session", dest="delete_session", nargs=1, help="Delete an AI session by ID")
+84 -84
View File
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Generated by the protocol buffer compiler. DO NOT EDIT!
# NO CHECKED-IN PROTOBUF GENCODE
# source: connpy/proto/connpy.proto
# source: connpy.proto
# Protobuf Python Version: 6.31.1
"""Generated protocol buffer code."""
from google.protobuf import descriptor as _descriptor
@@ -15,7 +15,7 @@ _runtime_version.ValidateProtobufRuntimeVersion(
31,
1,
'',
'connpy/proto/connpy.proto'
'connpy.proto'
)
# @@protoc_insertion_point(imports)
@@ -26,91 +26,91 @@ from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2
from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x19\x63onnpy/proto/connpy.proto\x12\x06\x63onnpy\x1a\x1cgoogle/protobuf/struct.proto\x1a\x1bgoogle/protobuf/empty.proto\"\xfc\x01\n\x0fInteractRequest\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0c\n\x04sftp\x18\x02 \x01(\x08\x12\r\n\x05\x64\x65\x62ug\x18\x03 \x01(\x08\x12\x12\n\nstdin_data\x18\x04 \x01(\x0c\x12\x0c\n\x04\x63ols\x18\x05 \x01(\x05\x12\x0c\n\x04rows\x18\x06 \x01(\x05\x12\x1e\n\x16\x63onnection_params_json\x18\x07 \x01(\t\x12\x18\n\x10\x63opilot_question\x18\x08 \x01(\t\x12\x16\n\x0e\x63opilot_action\x18\t \x01(\t\x12\x1e\n\x16\x63opilot_context_buffer\x18\n \x01(\t\x12\x1e\n\x16\x63opilot_node_info_json\x18\r \x01(\t\"\x86\x02\n\x10InteractResponse\x12\x13\n\x0bstdout_data\x18\x01 \x01(\x0c\x12\x0f\n\x07success\x18\x02 \x01(\x08\x12\x15\n\rerror_message\x18\x03 \x01(\t\x12\x16\n\x0e\x63opilot_prompt\x18\x04 \x01(\x08\x12\x1e\n\x16\x63opilot_buffer_preview\x18\x05 \x01(\t\x12\x1d\n\x15\x63opilot_response_json\x18\x06 \x01(\t\x12\x1e\n\x16\x63opilot_node_info_json\x18\x07 \x01(\t\x12\x1c\n\x14\x63opilot_stream_chunk\x18\x08 \x01(\t\x12 \n\x18\x63opilot_injected_command\x18\t \x01(\t\"7\n\rFilterRequest\x12\x12\n\nfilter_str\x18\x01 \x01(\t\x12\x12\n\nformat_str\x18\x02 \x01(\t\"5\n\rValueResponse\x12$\n\x04\x64\x61ta\x18\x01 \x01(\x0b\x32\x16.google.protobuf.Value\"\x17\n\tIdRequest\x12\n\n\x02id\x18\x01 \x01(\t\"S\n\x0bNodeRequest\x12\n\n\x02id\x18\x01 \x01(\t\x12%\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x17.google.protobuf.Struct\x12\x11\n\tis_folder\x18\x03 \x01(\x08\".\n\rDeleteRequest\x12\n\n\x02id\x18\x01 \x01(\t\x12\x11\n\tis_folder\x18\x02 \x01(\x08\"\x1d\n\x0cMessageValue\x12\r\n\x05value\x18\x01 \x01(\t\";\n\x0bMoveRequest\x12\x0e\n\x06src_id\x18\x01 \x01(\t\x12\x0e\n\x06\x64st_id\x18\x02 \x01(\t\x12\x0c\n\x04\x63opy\x18\x03 \x01(\x08\"W\n\x0b\x42ulkRequest\x12\x0b\n\x03ids\x18\x01 \x03(\t\x12\r\n\x05hosts\x18\x02 \x03(\t\x12,\n\x0b\x63ommon_data\x18\x03 \x01(\x0b\x32\x17.google.protobuf.Struct\"7\n\x0eStructResponse\x12%\n\x04\x64\x61ta\x18\x01 \x01(\x0b\x32\x17.google.protobuf.Struct\"/\n\x0eProfileRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0f\n\x07resolve\x18\x02 \x01(\x08\"6\n\rStructRequest\x12%\n\x04\x64\x61ta\x18\x01 \x01(\x0b\x32\x17.google.protobuf.Struct\"\x1e\n\rStringRequest\x12\r\n\x05value\x18\x01 \x01(\t\"\x1f\n\x0eStringResponse\x12\r\n\x05value\x18\x01 \x01(\t\"C\n\rUpdateRequest\x12\x0b\n\x03key\x18\x01 \x01(\t\x12%\n\x05value\x18\x02 \x01(\x0b\x32\x16.google.protobuf.Value\"B\n\rPluginRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x13\n\x0bsource_file\x18\x02 \x01(\t\x12\x0e\n\x06update\x18\x03 \x01(\x08\"\xa5\x01\n\nRunRequest\x12\r\n\x05nodes\x18\x01 \x03(\t\x12\x10\n\x08\x63ommands\x18\x02 \x03(\t\x12\x0e\n\x06\x66older\x18\x03 \x01(\t\x12\x0e\n\x06prompt\x18\x04 \x01(\t\x12\x10\n\x08parallel\x18\x05 \x01(\x05\x12%\n\x04vars\x18\x06 \x01(\x0b\x32\x17.google.protobuf.Struct\x12\x0f\n\x07timeout\x18\x07 \x01(\x05\x12\x0c\n\x04name\x18\x08 \x01(\t\"\xb8\x01\n\x0bTestRequest\x12\r\n\x05nodes\x18\x01 \x03(\t\x12\x10\n\x08\x63ommands\x18\x02 \x03(\t\x12\x10\n\x08\x65xpected\x18\x03 \x03(\t\x12\x0e\n\x06\x66older\x18\x04 \x01(\t\x12\x0e\n\x06prompt\x18\x05 \x01(\t\x12\x10\n\x08parallel\x18\x06 \x01(\x05\x12%\n\x04vars\x18\x07 \x01(\x0b\x32\x17.google.protobuf.Struct\x12\x0f\n\x07timeout\x18\x08 \x01(\x05\x12\x0c\n\x04name\x18\t \x01(\t\"A\n\rScriptRequest\x12\x0e\n\x06param1\x18\x01 \x01(\t\x12\x0e\n\x06param2\x18\x02 \x01(\t\x12\x10\n\x08parallel\x18\x03 \x01(\x05\"3\n\rExportRequest\x12\x11\n\tfile_path\x18\x01 \x01(\t\x12\x0f\n\x07\x66olders\x18\x02 \x03(\t\"\x1c\n\x0bListRequest\x12\r\n\x05items\x18\x01 \x03(\t\"\xa6\x02\n\nAskRequest\x12\x12\n\ninput_text\x18\x01 \x01(\t\x12\x0e\n\x06\x64ryrun\x18\x02 \x01(\x08\x12,\n\x0c\x63hat_history\x18\x03 \x01(\x0b\x32\x16.google.protobuf.Value\x12\x12\n\nsession_id\x18\x04 \x01(\t\x12\r\n\x05\x64\x65\x62ug\x18\x05 \x01(\x08\x12\x16\n\x0e\x65ngineer_model\x18\x06 \x01(\t\x12\x18\n\x10\x65ngineer_api_key\x18\x07 \x01(\t\x12\x17\n\x0f\x61rchitect_model\x18\x08 \x01(\t\x12\x19\n\x11\x61rchitect_api_key\x18\t \x01(\t\x12\r\n\x05trust\x18\n \x01(\x08\x12\x1b\n\x13\x63onfirmation_answer\x18\x0b \x01(\t\x12\x11\n\tinterrupt\x18\x0c \x01(\x08\"\xc8\x01\n\nAIResponse\x12\x12\n\ntext_chunk\x18\x01 \x01(\t\x12\x10\n\x08is_final\x18\x02 \x01(\x08\x12,\n\x0b\x66ull_result\x18\x03 \x01(\x0b\x32\x17.google.protobuf.Struct\x12\x15\n\rstatus_update\x18\x04 \x01(\t\x12\x15\n\rdebug_message\x18\x05 \x01(\t\x12\x1d\n\x15requires_confirmation\x18\x06 \x01(\x08\x12\x19\n\x11important_message\x18\x07 \x01(\t\"\x1d\n\x0c\x42oolResponse\x12\r\n\x05value\x18\x01 \x01(\x08\"C\n\x0fProviderRequest\x12\x10\n\x08provider\x18\x01 \x01(\t\x12\r\n\x05model\x18\x02 \x01(\t\x12\x0f\n\x07\x61pi_key\x18\x03 \x01(\t\"\x1b\n\nIntRequest\x12\r\n\x05value\x18\x01 \x01(\x05\"p\n\rNodeRunResult\x12\x11\n\tunique_id\x18\x01 \x01(\t\x12\x0e\n\x06output\x18\x02 \x01(\t\x12\x0e\n\x06status\x18\x03 \x01(\x05\x12,\n\x0Line truncated
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0c\x63onnpy.proto\x12\x06\x63onnpy\x1a\x1cgoogle/protobuf/struct.proto\x1a\x1bgoogle/protobuf/empty.proto\"\xfc\x01\n\x0fInteractRequest\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0c\n\x04sftp\x18\x02 \x01(\x08\x12\r\n\x05\x64\x65\x62ug\x18\x03 \x01(\x08\x12\x12\n\nstdin_data\x18\x04 \x01(\x0c\x12\x0c\n\x04\x63ols\x18\x05 \x01(\x05\x12\x0c\n\x04rows\x18\x06 \x01(\x05\x12\x1e\n\x16\x63onnection_params_json\x18\x07 \x01(\t\x12\x18\n\x10\x63opilot_question\x18\x08 \x01(\t\x12\x16\n\x0e\x63opilot_action\x18\t \x01(\t\x12\x1e\n\x16\x63opilot_context_buffer\x18\n \x01(\t\x12\x1e\n\x16\x63opilot_node_info_json\x18\r \x01(\t\"\x86\x02\n\x10InteractResponse\x12\x13\n\x0bstdout_data\x18\x01 \x01(\x0c\x12\x0f\n\x07success\x18\x02 \x01(\x08\x12\x15\n\rerror_message\x18\x03 \x01(\t\x12\x16\n\x0e\x63opilot_prompt\x18\x04 \x01(\x08\x12\x1e\n\x16\x63opilot_buffer_preview\x18\x05 \x01(\t\x12\x1d\n\x15\x63opilot_response_json\x18\x06 \x01(\t\x12\x1e\n\x16\x63opilot_node_info_json\x18\x07 \x01(\t\x12\x1c\n\x14\x63opilot_stream_chunk\x18\x08 \x01(\t\x12 \n\x18\x63opilot_injected_command\x18\t \x01(\t\"7\n\rFilterRequest\x12\x12\n\nfilter_str\x18\x01 \x01(\t\x12\x12\n\nformat_str\x18\x02 \x01(\t\"5\n\rValueResponse\x12$\n\x04\x64\x61ta\x18\x01 \x01(\x0b\x32\x16.google.protobuf.Value\"\x17\n\tIdRequest\x12\n\n\x02id\x18\x01 \x01(\t\"S\n\x0bNodeRequest\x12\n\n\x02id\x18\x01 \x01(\t\x12%\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x17.google.protobuf.Struct\x12\x11\n\tis_folder\x18\x03 \x01(\x08\".\n\rDeleteRequest\x12\n\n\x02id\x18\x01 \x01(\t\x12\x11\n\tis_folder\x18\x02 \x01(\x08\"\x1d\n\x0cMessageValue\x12\r\n\x05value\x18\x01 \x01(\t\";\n\x0bMoveRequest\x12\x0e\n\x06src_id\x18\x01 \x01(\t\x12\x0e\n\x06\x64st_id\x18\x02 \x01(\t\x12\x0c\n\x04\x63opy\x18\x03 \x01(\x08\"W\n\x0b\x42ulkRequest\x12\x0b\n\x03ids\x18\x01 \x03(\t\x12\r\n\x05hosts\x18\x02 \x03(\t\x12,\n\x0b\x63ommon_data\x18\x03 \x01(\x0b\x32\x17.google.protobuf.Struct\"7\n\x0eStructResponse\x12%\n\x04\x64\x61ta\x18\x01 \x01(\x0b\x32\x17.google.protobuf.Struct\"/\n\x0eProfileRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0f\n\x07resolve\x18\x02 \x01(\x08\"6\n\rStructRequest\x12%\n\x04\x64\x61ta\x18\x01 \x01(\x0b\x32\x17.google.protobuf.Struct\"\x1e\n\rStringRequest\x12\r\n\x05value\x18\x01 \x01(\t\"\x1f\n\x0eStringResponse\x12\r\n\x05value\x18\x01 \x01(\t\"C\n\rUpdateRequest\x12\x0b\n\x03key\x18\x01 \x01(\t\x12%\n\x05value\x18\x02 \x01(\x0b\x32\x16.google.protobuf.Value\"B\n\rPluginRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x13\n\x0bsource_file\x18\x02 \x01(\t\x12\x0e\n\x06update\x18\x03 \x01(\x08\"\xa5\x01\n\nRunRequest\x12\r\n\x05nodes\x18\x01 \x03(\t\x12\x10\n\x08\x63ommands\x18\x02 \x03(\t\x12\x0e\n\x06\x66older\x18\x03 \x01(\t\x12\x0e\n\x06prompt\x18\x04 \x01(\t\x12\x10\n\x08parallel\x18\x05 \x01(\x05\x12%\n\x04vars\x18\x06 \x01(\x0b\x32\x17.google.protobuf.Struct\x12\x0f\n\x07timeout\x18\x07 \x01(\x05\x12\x0c\n\x04name\x18\x08 \x01(\t\"\xb8\x01\n\x0bTestRequest\x12\r\n\x05nodes\x18\x01 \x03(\t\x12\x10\n\x08\x63ommands\x18\x02 \x03(\t\x12\x10\n\x08\x65xpected\x18\x03 \x03(\t\x12\x0e\n\x06\x66older\x18\x04 \x01(\t\x12\x0e\n\x06prompt\x18\x05 \x01(\t\x12\x10\n\x08parallel\x18\x06 \x01(\x05\x12%\n\x04vars\x18\x07 \x01(\x0b\x32\x17.google.protobuf.Struct\x12\x0f\n\x07timeout\x18\x08 \x01(\x05\x12\x0c\n\x04name\x18\t \x01(\t\"A\n\rScriptRequest\x12\x0e\n\x06param1\x18\x01 \x01(\t\x12\x0e\n\x06param2\x18\x02 \x01(\t\x12\x10\n\x08parallel\x18\x03 \x01(\x05\"3\n\rExportRequest\x12\x11\n\tfile_path\x18\x01 \x01(\t\x12\x0f\n\x07\x66olders\x18\x02 \x03(\t\"\x1c\n\x0bListRequest\x12\r\n\x05items\x18\x01 \x03(\t\"\xa6\x02\n\nAskRequest\x12\x12\n\ninput_text\x18\x01 \x01(\t\x12\x0e\n\x06\x64ryrun\x18\x02 \x01(\x08\x12,\n\x0c\x63hat_history\x18\x03 \x01(\x0b\x32\x16.google.protobuf.Value\x12\x12\n\nsession_id\x18\x04 \x01(\t\x12\r\n\x05\x64\x65\x62ug\x18\x05 \x01(\x08\x12\x16\n\x0e\x65ngineer_model\x18\x06 \x01(\t\x12\x18\n\x10\x65ngineer_api_key\x18\x07 \x01(\t\x12\x17\n\x0f\x61rchitect_model\x18\x08 \x01(\t\x12\x19\n\x11\x61rchitect_api_key\x18\t \x01(\t\x12\r\n\x05trust\x18\n \x01(\x08\x12\x1b\n\x13\x63onfirmation_answer\x18\x0b \x01(\t\x12\x11\n\tinterrupt\x18\x0c \x01(\x08\"\xc8\x01\n\nAIResponse\x12\x12\n\ntext_chunk\x18\x01 \x01(\t\x12\x10\n\x08is_final\x18\x02 \x01(\x08\x12,\n\x0b\x66ull_result\x18\x03 \x01(\x0b\x32\x17.google.protobuf.Struct\x12\x15\n\rstatus_update\x18\x04 \x01(\t\x12\x15\n\rdebug_message\x18\x05 \x01(\t\x12\x1d\n\x15requires_confirmation\x18\x06 \x01(\x08\x12\x19\n\x11important_message\x18\x07 \x01(\t\"\x1d\n\x0c\x42oolResponse\x12\r\n\x05value\x18\x01 \x01(\x08\"C\n\x0fProviderRequest\x12\x10\n\x08provider\x18\x01 \x01(\t\x12\r\n\x05model\x18\x02 \x01(\t\x12\x0f\n\x07\x61pi_key\x18\x03 \x01(\t\"\x1b\n\nIntRequest\x12\r\n\x05value\x18\x01 \x01(\x05\"p\n\rNodeRunResult\x12\x11\n\tunique_id\x18\x01 \x01(\t\x12\x0e\n\x06output\x18\x02 \x01(\t\x12\x0e\n\x06status\x18\x03 \x01(\x05\x12,\n\x0btest_result\Line truncated
_globals = globals()
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'connpy.proto.connpy_pb2', _globals)
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'connpy_pb2', _globals)
if not _descriptor._USE_C_DESCRIPTORS:
DESCRIPTOR._loaded_options = None
_globals['_INTERACTREQUEST']._serialized_start=97
_globals['_INTERACTREQUEST']._serialized_end=349
_globals['_INTERACTRESPONSE']._serialized_start=352
_globals['_INTERACTRESPONSE']._serialized_end=614
_globals['_FILTERREQUEST']._serialized_start=616
_globals['_FILTERREQUEST']._serialized_end=671
_globals['_VALUERESPONSE']._serialized_start=673
_globals['_VALUERESPONSE']._serialized_end=726
_globals['_IDREQUEST']._serialized_start=728
_globals['_IDREQUEST']._serialized_end=751
_globals['_NODEREQUEST']._serialized_start=753
_globals['_NODEREQUEST']._serialized_end=836
_globals['_DELETEREQUEST']._serialized_start=838
_globals['_DELETEREQUEST']._serialized_end=884
_globals['_MESSAGEVALUE']._serialized_start=886
_globals['_MESSAGEVALUE']._serialized_end=915
_globals['_MOVEREQUEST']._serialized_start=917
_globals['_MOVEREQUEST']._serialized_end=976
_globals['_BULKREQUEST']._serialized_start=978
_globals['_BULKREQUEST']._serialized_end=1065
_globals['_STRUCTRESPONSE']._serialized_start=1067
_globals['_STRUCTRESPONSE']._serialized_end=1122
_globals['_PROFILEREQUEST']._serialized_start=1124
_globals['_PROFILEREQUEST']._serialized_end=1171
_globals['_STRUCTREQUEST']._serialized_start=1173
_globals['_STRUCTREQUEST']._serialized_end=1227
_globals['_STRINGREQUEST']._serialized_start=1229
_globals['_STRINGREQUEST']._serialized_end=1259
_globals['_STRINGRESPONSE']._serialized_start=1261
_globals['_STRINGRESPONSE']._serialized_end=1292
_globals['_UPDATEREQUEST']._serialized_start=1294
_globals['_UPDATEREQUEST']._serialized_end=1361
_globals['_PLUGINREQUEST']._serialized_start=1363
_globals['_PLUGINREQUEST']._serialized_end=1429
_globals['_RUNREQUEST']._serialized_start=1432
_globals['_RUNREQUEST']._serialized_end=1597
_globals['_TESTREQUEST']._serialized_start=1600
_globals['_TESTREQUEST']._serialized_end=1784
_globals['_SCRIPTREQUEST']._serialized_start=1786
_globals['_SCRIPTREQUEST']._serialized_end=1851
_globals['_EXPORTREQUEST']._serialized_start=1853
_globals['_EXPORTREQUEST']._serialized_end=1904
_globals['_LISTREQUEST']._serialized_start=1906
_globals['_LISTREQUEST']._serialized_end=1934
_globals['_ASKREQUEST']._serialized_start=1937
_globals['_ASKREQUEST']._serialized_end=2231
_globals['_AIRESPONSE']._serialized_start=2234
_globals['_AIRESPONSE']._serialized_end=2434
_globals['_BOOLRESPONSE']._serialized_start=2436
_globals['_BOOLRESPONSE']._serialized_end=2465
_globals['_PROVIDERREQUEST']._serialized_start=2467
_globals['_PROVIDERREQUEST']._serialized_end=2534
_globals['_INTREQUEST']._serialized_start=2536
_globals['_INTREQUEST']._serialized_end=2563
_globals['_NODERUNRESULT']._serialized_start=2565
_globals['_NODERUNRESULT']._serialized_end=2677
_globals['_FULLREPLACEREQUEST']._serialized_start=2679
_globals['_FULLREPLACEREQUEST']._serialized_end=2788
_globals['_COPILOTREQUEST']._serialized_start=2790
_globals['_COPILOTREQUEST']._serialized_end=2878
_globals['_COPILOTRESPONSE']._serialized_start=2880
_globals['_COPILOTRESPONSE']._serialized_end=2965
_globals['_MCPREQUEST']._serialized_start=2967
_globals['_MCPREQUEST']._serialized_end=3064
_globals['_NODESERVICE']._serialized_start=3067
_globals['_NODESERVICE']._serialized_end=4060
_globals['_PROFILESERVICE']._serialized_start=4063
_globals['_PROFILESERVICE']._serialized_end=4469
_globals['_CONFIGSERVICE']._serialized_start=4472
_globals['_CONFIGSERVICE']._serialized_end=4902
_globals['_PLUGINSERVICE']._serialized_start=4905
_globals['_PLUGINSERVICE']._serialized_end=5235
_globals['_EXECUTIONSERVICE']._serialized_start=5238
_globals['_EXECUTIONSERVICE']._serialized_end=5521
_globals['_IMPORTEXPORTSERVICE']._serialized_start=5524
_globals['_IMPORTEXPORTSERVICE']._serialized_end=5750
_globals['_AISERVICE']._serialized_start=5753
_globals['_AISERVICE']._serialized_end=6280
_globals['_SYSTEMSERVICE']._serialized_start=6283
_globals['_SYSTEMSERVICE']._serialized_end=6605
_globals['_INTERACTREQUEST']._serialized_start=84
_globals['_INTERACTREQUEST']._serialized_end=336
_globals['_INTERACTRESPONSE']._serialized_start=339
_globals['_INTERACTRESPONSE']._serialized_end=601
_globals['_FILTERREQUEST']._serialized_start=603
_globals['_FILTERREQUEST']._serialized_end=658
_globals['_VALUERESPONSE']._serialized_start=660
_globals['_VALUERESPONSE']._serialized_end=713
_globals['_IDREQUEST']._serialized_start=715
_globals['_IDREQUEST']._serialized_end=738
_globals['_NODEREQUEST']._serialized_start=740
_globals['_NODEREQUEST']._serialized_end=823
_globals['_DELETEREQUEST']._serialized_start=825
_globals['_DELETEREQUEST']._serialized_end=871
_globals['_MESSAGEVALUE']._serialized_start=873
_globals['_MESSAGEVALUE']._serialized_end=902
_globals['_MOVEREQUEST']._serialized_start=904
_globals['_MOVEREQUEST']._serialized_end=963
_globals['_BULKREQUEST']._serialized_start=965
_globals['_BULKREQUEST']._serialized_end=1052
_globals['_STRUCTRESPONSE']._serialized_start=1054
_globals['_STRUCTRESPONSE']._serialized_end=1109
_globals['_PROFILEREQUEST']._serialized_start=1111
_globals['_PROFILEREQUEST']._serialized_end=1158
_globals['_STRUCTREQUEST']._serialized_start=1160
_globals['_STRUCTREQUEST']._serialized_end=1214
_globals['_STRINGREQUEST']._serialized_start=1216
_globals['_STRINGREQUEST']._serialized_end=1246
_globals['_STRINGRESPONSE']._serialized_start=1248
_globals['_STRINGRESPONSE']._serialized_end=1279
_globals['_UPDATEREQUEST']._serialized_start=1281
_globals['_UPDATEREQUEST']._serialized_end=1348
_globals['_PLUGINREQUEST']._serialized_start=1350
_globals['_PLUGINREQUEST']._serialized_end=1416
_globals['_RUNREQUEST']._serialized_start=1419
_globals['_RUNREQUEST']._serialized_end=1584
_globals['_TESTREQUEST']._serialized_start=1587
_globals['_TESTREQUEST']._serialized_end=1771
_globals['_SCRIPTREQUEST']._serialized_start=1773
_globals['_SCRIPTREQUEST']._serialized_end=1838
_globals['_EXPORTREQUEST']._serialized_start=1840
_globals['_EXPORTREQUEST']._serialized_end=1891
_globals['_LISTREQUEST']._serialized_start=1893
_globals['_LISTREQUEST']._serialized_end=1921
_globals['_ASKREQUEST']._serialized_start=1924
_globals['_ASKREQUEST']._serialized_end=2218
_globals['_AIRESPONSE']._serialized_start=2221
_globals['_AIRESPONSE']._serialized_end=2421
_globals['_BOOLRESPONSE']._serialized_start=2423
_globals['_BOOLRESPONSE']._serialized_end=2452
_globals['_PROVIDERREQUEST']._serialized_start=2454
_globals['_PROVIDERREQUEST']._serialized_end=2521
_globals['_INTREQUEST']._serialized_start=2523
_globals['_INTREQUEST']._serialized_end=2550
_globals['_NODERUNRESULT']._serialized_start=2552
_globals['_NODERUNRESULT']._serialized_end=2664
_globals['_FULLREPLACEREQUEST']._serialized_start=2666
_globals['_FULLREPLACEREQUEST']._serialized_end=2775
_globals['_COPILOTREQUEST']._serialized_start=2777
_globals['_COPILOTREQUEST']._serialized_end=2865
_globals['_COPILOTRESPONSE']._serialized_start=2867
_globals['_COPILOTRESPONSE']._serialized_end=2952
_globals['_MCPREQUEST']._serialized_start=2954
_globals['_MCPREQUEST']._serialized_end=3051
_globals['_NODESERVICE']._serialized_start=3054
_globals['_NODESERVICE']._serialized_end=4047
_globals['_PROFILESERVICE']._serialized_start=4050
_globals['_PROFILESERVICE']._serialized_end=4456
_globals['_CONFIGSERVICE']._serialized_start=4459
_globals['_CONFIGSERVICE']._serialized_end=4889
_globals['_PLUGINSERVICE']._serialized_start=4892
_globals['_PLUGINSERVICE']._serialized_end=5222
_globals['_EXECUTIONSERVICE']._serialized_start=5225
_globals['_EXECUTIONSERVICE']._serialized_end=5508
_globals['_IMPORTEXPORTSERVICE']._serialized_start=5511
_globals['_IMPORTEXPORTSERVICE']._serialized_end=5737
_globals['_AISERVICE']._serialized_start=5740
_globals['_AISERVICE']._serialized_end=6336
_globals['_SYSTEMSERVICE']._serialized_start=6339
_globals['_SYSTEMSERVICE']._serialized_end=6661
# @@protoc_insertion_point(module_scope)
File diff suppressed because it is too large. Load diff
+17 -2
View File
@@ -483,6 +483,7 @@ class ProfileServicer(connpy_pb2_grpc.ProfileServiceServicer):
self.service = ProfileService(config)
self.node_service = NodeService(config)
@handle_errors
def list_profiles(self, request, context):
f = request.filter_str if request.filter_str else None
@@ -731,6 +732,7 @@ class StatusBridge:
self.on_interrupt = self._force_interrupt
self.thread = None
self.is_web = is_web
self.is_remote = True
def _force_interrupt(self):
"""Forcefully raise KeyboardInterrupt in the target thread."""
@@ -862,9 +864,11 @@ class AIServicer(connpy_pb2_grpc.AIServiceServicer):
print(f"AI Task Error: {e}")
traceback.print_exc()
chunk_queue.put(("status", f"Error: {str(e)}"))
# Crucial: always send final_mark to avoid client deadlock
chunk_queue.put(("final_mark", {"response": f"Error: {str(e)}", "chat_history": history, "error": True}))
def request_listener():
nonlocal bridge, is_web, ai_thread, agent_instance
nonlocal bridge, is_web, ai_thread, agent_instance, history
try:
for req in request_iterator:
if req.interrupt:
@@ -878,6 +882,11 @@ class AIServicer(connpy_pb2_grpc.AIServiceServicer):
if req.input_text:
is_web = "web" in (req.session_id or "").lower() or (req.session_id or "").lower().startswith("ws-")
# Hydrate history from client if it's the first interaction in this stream
if not history and req.chat_history:
from .utils import from_value
history = from_value(req.chat_history) or []
if not bridge:
bridge = StatusBridge(chunk_queue, request_queue=request_queue, is_web=is_web)
@@ -948,7 +957,8 @@ class AIServicer(connpy_pb2_grpc.AIServiceServicer):
@handle_errors
def list_sessions(self, request, context):
return connpy_pb2.ValueResponse(data=to_value(self.service.list_sessions()))
sessions, total = self.service.list_sessions()
return connpy_pb2.ValueResponse(data=to_value(sessions))
@handle_errors
def delete_session(self, request, context):
@@ -971,6 +981,11 @@ class AIServicer(connpy_pb2_grpc.AIServiceServicer):
)
return Empty()
@handle_errors
def list_mcp_servers(self, request, context):
mcp_servers = self.service.list_mcp_servers()
return connpy_pb2.ValueResponse(data=to_value(mcp_servers))
@handle_errors
def load_session_data(self, request, context):
return connpy_pb2.StructResponse(data=to_struct(self.service.load_session_data(request.value)))
+20 -3
View File
@@ -758,6 +758,7 @@ class AIStub:
full_content = ""
header_printed = False
current_responder = "engineer"
final_result = {"response": "", "chat_history": []}
# Background thread to pull responses from gRPC into a local queue
@@ -802,6 +803,10 @@ class AIStub:
break
if response.status_update:
if response.status_update.startswith("__RESPONDER__:"):
current_responder = response.status_update.split(":")[1].lower()
continue
if response.requires_confirmation:
if status: status.stop()
@@ -854,7 +859,9 @@ class AIStub:
stable_console = RichConsole(theme=connpy_theme, file=get_original_stdout())
# Print header on first chunk
stable_console.print(Rule("[bold engineer]Network Engineer[/bold engineer]", style="engineer"))
alias = "architect" if current_responder == "architect" else "engineer"
role_label = "Network Architect" if current_responder == "architect" else "Network Engineer"
stable_console.print(Rule(f"[bold {alias}]{role_label}[/bold {alias}]", style=alias))
header_printed = True
# Initialize parser
@@ -906,8 +913,13 @@ class AIStub:
return self.stub.confirm(connpy_pb2.StringRequest(value=input_text)).value
@handle_errors
def list_sessions(self):
return from_value(self.stub.list_sessions(Empty()).data)
def list_sessions(self, limit=None):
from .utils import from_value
res = self.stub.list_sessions(Empty())
sessions = from_value(res.data) or []
if limit and len(sessions) > limit:
return sessions[:limit], len(sessions)
return sessions, len(sessions)
@handle_errors
def delete_session(self, session_id):
@@ -929,6 +941,11 @@ class AIStub:
)
self.stub.configure_mcp(req)
@handle_errors
def list_mcp_servers(self):
res = self.stub.list_mcp_servers(Empty())
return from_value(res.data) or {}
@handle_errors
def load_session_data(self, session_id):
return from_struct(self.stub.load_session_data(connpy_pb2.StringRequest(value=session_id)).data)
+1
View File
@@ -70,6 +70,7 @@ service AIService {
rpc delete_session (StringRequest) returns (google.protobuf.Empty) {}
rpc configure_provider (ProviderRequest) returns (google.protobuf.Empty) {}
rpc configure_mcp (MCPRequest) returns (google.protobuf.Empty) {}
rpc list_mcp_servers (google.protobuf.Empty) returns (ValueResponse) {}
rpc load_session_data (StringRequest) returns (StructResponse) {}
}
+11 -3
View File
@@ -167,11 +167,14 @@ class AIService(BaseService):
return await asyncio.wrap_future(future)
def list_sessions(self):
"""Return a list of all saved AI sessions."""
def list_sessions(self, limit=None):
"""Return a list of saved AI sessions, optionally limited."""
from connpy.ai import ai
agent = ai(self.config)
return agent._get_sessions()
sessions = agent._get_sessions()
if limit and len(sessions) > limit:
return sessions[:limit], len(sessions)
return sessions, len(sessions)
def delete_session(self, session_id):
"""Delete an AI session by ID."""
@@ -228,6 +231,11 @@ class AIService(BaseService):
self.config.config["ai"] = ai_settings
self.config._saveconfig(self.config.file)
def list_mcp_servers(self) -> dict:
"""Get the configured MCP servers."""
ai_settings = self.config.config.get("ai", {})
return ai_settings.get("mcp_servers", {})
def load_session_data(self, session_id):
"""Load a session's raw data by ID."""
from connpy.ai import ai
+11
View File
@@ -120,6 +120,7 @@ class TestGRPCIntegration:
connpy_pb2_grpc.add_ConfigServiceServicer_to_server(server.ConfigServicer(populated_config), srv)
connpy_pb2_grpc.add_ExecutionServiceServicer_to_server(server.ExecutionServicer(populated_config), srv)
connpy_pb2_grpc.add_ImportExportServiceServicer_to_server(server.ImportExportServicer(populated_config), srv)
connpy_pb2_grpc.add_AIServiceServicer_to_server(server.AIServicer(populated_config), srv)
port = srv.add_insecure_port('127.0.0.1:0')
srv.start()
@@ -143,6 +144,10 @@ class TestGRPCIntegration:
def config_stub(self, channel):
return stubs.ConfigStub(channel, "localhost")
@pytest.fixture
def ai_stub(self, channel):
return stubs.AIStub(channel, "localhost")
def test_list_nodes_integration(self, node_stub):
nodes = node_stub.list_nodes()
assert "router1" in nodes
@@ -170,6 +175,12 @@ class TestGRPCIntegration:
settings = config_stub.get_settings()
assert settings["idletime"] == 99
def test_list_mcp_servers_integration(self, ai_stub):
ai_stub.configure_mcp("test-mcp", url="http://localhost:8080", enabled=True)
servers = ai_stub.list_mcp_servers()
assert "test-mcp" in servers
assert servers["test-mcp"]["url"] == "http://localhost:8080"
def test_add_delete_node_integration(self, node_stub):
node_stub.add_node("integration-test-node", {"host": "9.9.9.9"})
assert "integration-test-node" in node_stub.list_nodes()