process-gpt-agent-sdk 0.1.2__tar.gz → 0.1.3__tar.gz

{process_gpt_agent_sdk-0.1.2/process_gpt_agent_sdk.egg-info → process_gpt_agent_sdk-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: process-gpt-agent-sdk
-Version: 0.1.2
+Version: 0.1.3
 Summary: Supabase 기반 이벤트/작업 폴링으로 A2A AgentExecutor를 실행하는 SDK
 License: MIT
 Project-URL: Homepage, https://github.com/your-org/process-gpt-agent-sdk

{process_gpt_agent_sdk-0.1.2 → process_gpt_agent_sdk-0.1.3/process_gpt_agent_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: process-gpt-agent-sdk
-Version: 0.1.2
+Version: 0.1.3
 Summary: Supabase 기반 이벤트/작업 폴링으로 A2A AgentExecutor를 실행하는 SDK
 License: MIT
 Project-URL: Homepage, https://github.com/your-org/process-gpt-agent-sdk

{process_gpt_agent_sdk-0.1.2 → process_gpt_agent_sdk-0.1.3}/process_gpt_agent_sdk.egg-info/SOURCES.txt

@@ -15,6 +15,8 @@ processgpt_agent_sdk/tools/__init__.py
 processgpt_agent_sdk/tools/knowledge_tools.py
 processgpt_agent_sdk/tools/safe_tool_loader.py
 processgpt_agent_sdk/utils/__init__.py
+processgpt_agent_sdk/utils/context_manager.py
+processgpt_agent_sdk/utils/crewai_event_listener.py
 processgpt_agent_sdk/utils/event_handler.py
 processgpt_agent_sdk/utils/logger.py
 processgpt_agent_sdk/utils/summarizer.py

{process_gpt_agent_sdk-0.1.2 → process_gpt_agent_sdk-0.1.3}/processgpt_agent_sdk/__init__.py

@@ -1,7 +1,7 @@
-from .server import ProcessGPTAgentServer, ProcessGPTRequestContext, ProcessGPTEventQueue
-
-__all__ = [
-	"ProcessGPTAgentServer",
-	"ProcessGPTRequestContext",
-	"ProcessGPTEventQueue",
-]
+from .server import ProcessGPTAgentServer, ProcessGPTRequestContext, ProcessGPTEventQueue
+
+__all__ = [
+	"ProcessGPTAgentServer",
+	"ProcessGPTRequestContext",
+	"ProcessGPTEventQueue",
+]

process_gpt_agent_sdk-0.1.3/processgpt_agent_sdk/core/database.py

@@ -0,0 +1,373 @@
+"""ProcessGPT DB utilities
+
+역할:
+- Supabase 연결/초기화
+- 안전한 RPC/CRUD 호출(재시도/폴백 포함)
+- 이벤트 기록, 작업 클레임/상태/저장/조회, 사용자·에이전트·폼·테넌트 조회
+
+반환 규칙(폴백 포함):
+- Optional 단건 조회 계열 → 실패 시 None
+- 목록/시퀀스 계열 → 실패 시 빈 리스트 []
+- 변경/기록 계열 → 실패 시 경고 로그만 남기고 None
+"""
+
+import os
+import json
+import asyncio
+import socket
+import uuid
+from datetime import datetime
+from typing import Any, Dict, List, Optional, Tuple
+
+from dotenv import load_dotenv
+from supabase import Client, create_client
+import logging
+import random
+from typing import Callable, TypeVar
+
+T = TypeVar("T")
+
+from ..utils.logger import handle_error as _emit_error, log as _emit_log
+
+
+async def _async_retry(
+    fn: Callable[[], T],
+    *,
+    name: str,
+    retries: int = 3,
+    base_delay: float = 0.8,
+    fallback: Optional[Callable[[], T]] = None,
+) -> Optional[T]:
+    """재시도 유틸(지수 백오프+jitter).
+
+    - 최종 실패 시: fallback이 있으면 실행, 없으면 None
+    - 로그: 시도/지연/최종 실패/폴백 사용/폴백 실패
+    """
+    last_err: Optional[Exception] = None
+    for attempt in range(1, retries + 1):
+        try:
+            # 블로킹 DB 호출은 스레드로 위임해 이벤트 루프 차단 방지
+            return await asyncio.to_thread(fn)
+        except Exception as e:
+            last_err = e
+            jitter = random.uniform(0, 0.3)
+            delay = base_delay * (2 ** (attempt - 1)) + jitter
+            _emit_log(f"{name} 재시도 {attempt}/{retries} (delay={delay:.2f}s): {e}", level=logging.WARNING)
+            await asyncio.sleep(delay)
+    _emit_log(f"{name} 최종 실패: {last_err}", level=logging.ERROR)
+    if fallback is not None:
+        try:
+            fb_val = fallback()
+            _emit_log(f"{name} 폴백 사용", level=logging.WARNING)
+            return fb_val
+        except Exception as e:
+            _emit_log(f"{name} 폴백 실패: {e}", level=logging.ERROR)
+    return None
+ 
+
+
+# ------------------------------
+# Consumer 식별자 도우미
+# ------------------------------
+_supabase_client: Optional[Client] = None
+
+
+def initialize_db() -> None:
+    """환경변수 로드 및 Supabase 클라이언트 초기화"""
+    global _supabase_client
+    if _supabase_client is not None:
+        return
+    if os.getenv("ENV") != "production":
+        load_dotenv()
+    supabase_url = os.getenv("SUPABASE_URL") or os.getenv("SUPABASE_KEY_URL")
+    supabase_key = os.getenv("SUPABASE_KEY") or os.getenv("SUPABASE_ANON_KEY")
+    if not supabase_url or not supabase_key:
+        raise RuntimeError("SUPABASE_URL 및 SUPABASE_KEY가 필요합니다")
+    _supabase_client = create_client(supabase_url, supabase_key)
+
+
+def get_db_client() -> Client:
+    """초기화된 Supabase 클라이언트 반환."""
+    if _supabase_client is None:
+        raise RuntimeError("DB 미초기화: initialize_db() 먼저 호출")
+    return _supabase_client
+
+
+def get_consumer_id() -> str:
+    """파드/프로세스 식별자 생성(CONSUMER_ID>HOST:PID)."""
+    env_consumer = os.getenv("CONSUMER_ID")
+    if env_consumer:
+        return env_consumer
+    host = socket.gethostname()
+    pid = os.getpid()
+    return f"{host}:{pid}"
+
+
+# ------------------------------
+# 폴링: 대기 작업 1건 클레임(RPC 내부에서 상태 변경 포함)
+# ------------------------------
+async def polling_pending_todos(agent_orch: str, consumer: str) -> Optional[Dict[str, Any]]:
+    """대기중 작업 하나를 RPC로 클레임하고 반환. 실패/없음 시 None."""
+    def _call():
+        client = get_db_client()
+        return client.rpc(
+            "fetch_pending_task",
+            {"p_agent_orch": agent_orch, "p_consumer": consumer, "p_limit": 1},
+        ).execute()
+
+    resp = await _async_retry(_call, name="polling_pending_todos", fallback=lambda: None)
+    if not resp or not resp.data:
+        return None
+    return resp.data[0]
+
+
+# ------------------------------
+# 단건 todo 조회
+# ------------------------------
+async def fetch_todo_by_id(todo_id: str) -> Optional[Dict[str, Any]]:
+    """todolist에서 특정 id의 row 단건 조회. 실패 시 None."""
+    if not todo_id:
+        return None
+    def _call():
+        client = get_db_client()
+        return (
+            client.table("todolist").select("*").eq("id", todo_id).single().execute()
+        )
+
+    resp = await _async_retry(_call, name="fetch_todo_by_id")
+    if not resp or not resp.data:
+        return None
+    return resp.data
+
+
+# ------------------------------
+# 이벤트 기록
+# ------------------------------
+async def record_event(todo: Dict[str, Any], data: Dict[str, Any], event_type: Optional[str] = None) -> None:
+    """UI용 events 테이블에 이벤트 기록. 실패해도 플로우 지속."""
+    def _call():
+        client = get_db_client()
+        payload: Dict[str, Any] = {
+            "id": str(uuid.uuid4()),
+            "job_id": todo.get("proc_inst_id") or str(todo.get("id")),
+            "todo_id": str(todo.get("id")),
+            "proc_inst_id": todo.get("proc_inst_id"),
+            "crew_type": todo.get("agent_orch"),
+            "data": data,
+        }
+        if event_type is not None:
+            payload["event_type"] = event_type
+        return client.table("events").insert(payload).execute()
+
+    resp = await _async_retry(_call, name="record_event", fallback=lambda: None)
+    if resp is None:
+        _emit_log("record_event 최종 실패(무시)", level=logging.WARNING)
+
+
+# ------------------------------
+# 완료된 데이터 조회
+# ------------------------------
+async def fetch_done_data(proc_inst_id: Optional[str]) -> List[Any]:
+    """같은 proc_inst_id의 완료 output 목록 조회. 실패 시 []."""
+    if not proc_inst_id:
+        return []
+    def _call():
+        client = get_db_client()
+        return client.rpc("fetch_done_data", {"p_proc_inst_id": proc_inst_id}).execute()
+
+    resp = await _async_retry(_call, name="fetch_done_data", fallback=lambda: None)
+    if not resp:
+        return []
+    return [row.get("output") for row in (resp.data or [])]
+
+
+# ------------------------------
+# 결과 저장 (중간/최종)
+# ------------------------------
+async def save_task_result(todo_id: str, result: Any, final: bool = False) -> None:
+    """결과 저장 RPC(중간/최종). 실패해도 경고 로그 후 지속."""
+    def _call():
+        client = get_db_client()
+        payload = result if isinstance(result, (dict, list)) else json.loads(json.dumps(result))
+        return client.rpc(
+            "save_task_result",
+            {"p_todo_id": todo_id, "p_payload": payload, "p_final": final},
+        ).execute()
+
+    await _async_retry(_call, name="save_task_result", fallback=lambda: None)
+
+
+# ------------------------------
+# 추가 유틸: 이벤트/작업/사용자/에이전트/폼/테넌트 조회
+# ------------------------------
+async def fetch_human_response(job_id: str) -> Optional[Dict[str, Any]]:
+    """events에서 특정 job_id의 human_response 1건 조회. 실패 시 None."""
+    def _call():
+        client = get_db_client()
+        return (
+            client.table("events")
+            .select("*")
+            .eq("job_id", job_id)
+            .eq("event_type", "human_response")
+            .execute()
+        )
+
+    resp = await _async_retry(_call, name="fetch_human_response")
+    if not resp or not resp.data:
+        return None
+    return resp.data[0]
+
+
+async def fetch_task_status(todo_id: str) -> Optional[str]:
+    """todolist.draft_status 조회. 실패 시 None."""
+    def _call():
+        client = get_db_client()
+        return (
+            client.table("todolist").select("draft_status").eq("id", todo_id).single().execute()
+        )
+
+    resp = await _async_retry(_call, name="fetch_task_status")
+    if not resp or not resp.data:
+        return None
+    return resp.data.get("draft_status")
+
+
+async def fetch_all_agents() -> List[Dict[str, Any]]:
+    """모든 에이전트 목록 정규화 반환. 실패 시 []."""
+    def _call():
+        client = get_db_client()
+        return (
+            client.table("users")
+            .select("id, username, role, goal, persona, tools, profile, model, tenant_id, is_agent")
+            .eq("is_agent", True)
+            .execute()
+        )
+
+    resp = await _async_retry(_call, name="fetch_all_agents")
+    rows = resp.data or [] if resp else []
+    normalized: List[Dict[str, Any]] = []
+    for row in rows:
+        normalized.append(
+            {
+                "id": row.get("id"),
+                "name": row.get("username"),
+                "role": row.get("role"),
+                "goal": row.get("goal"),
+                "persona": row.get("persona"),
+                "tools": row.get("tools") or "mem0",
+                "profile": row.get("profile"),
+                "model": row.get("model"),
+                "tenant_id": row.get("tenant_id"),
+            }
+        )
+    return normalized
+
+
+async def fetch_agent_data(user_ids: str) -> List[Dict[str, Any]]:
+    """user_id(들)로 에이전트를 조회. 없거나 유효하지 않으면 모든 에이전트를 반환.
+
+    - 입력은 UUID 또는 콤마(,)로 구분된 UUID 목록을 허용
+    - 유효한 UUID가 하나도 없으면 전체 에이전트 반환
+    - 유효한 UUID로 조회했는데 결과가 비면 전체 에이전트 반환
+    """
+    def _is_valid_uuid(value: str) -> bool:
+        try:
+            uuid.UUID(str(value))
+            return True
+        except Exception:
+            return False
+
+    # 1) 입력 정규화 및 UUID 필터링
+    raw_ids = [x.strip() for x in (user_ids or "").split(",") if x.strip()]
+    valid_ids = [x for x in raw_ids if _is_valid_uuid(x)]
+
+    # 2) 유효한 UUID가 없으면 전체 에이전트 반환
+    if not valid_ids:
+        return await fetch_all_agents()
+
+    # 3) 유효한 UUID로 에이전트 조회
+    def _call():
+        client = get_db_client()
+        resp = (
+            client
+            .table("users")
+            .select("id, username, role, goal, persona, tools, profile, model, tenant_id, is_agent")
+            .in_("id", valid_ids)
+            .eq("is_agent", True)
+            .execute()
+        )
+        rows = resp.data or []
+        normalized: List[Dict[str, Any]] = []
+        for row in rows:
+            normalized.append(
+                {
+                    "id": row.get("id"),
+                    "name": row.get("username"),
+                    "role": row.get("role"),
+                    "goal": row.get("goal"),
+                    "persona": row.get("persona"),
+                    "tools": row.get("tools") or "mem0",
+                    "profile": row.get("profile"),
+                    "model": row.get("model"),
+                    "tenant_id": row.get("tenant_id"),
+                }
+            )
+        return normalized
+
+    result = await _async_retry(_call, name="fetch_agent_data", fallback=lambda: [])
+
+    # 4) 결과가 없으면 전체 에이전트로 폴백
+    if not result:
+        return await fetch_all_agents()
+
+    return result
+
+
+async def fetch_form_types(tool_val: str, tenant_id: str) -> Tuple[str, List[Dict[str, Any]]]:
+    """폼 타입 정의 조회 및 정규화. 실패 시 기본값 반환."""
+    def _call():
+        client = get_db_client()
+        form_id = tool_val[12:] if tool_val.startswith("formHandler:") else tool_val
+        resp = (
+            client.table("form_def").select("fields_json").eq("id", form_id).eq("tenant_id", tenant_id).execute()
+        )
+        fields_json = resp.data[0].get("fields_json") if resp.data else None
+        if not fields_json:
+            return form_id, [{"key": form_id, "type": "default", "text": ""}]
+        return form_id, fields_json
+
+    resp = await _async_retry(_call, name="fetch_form_types", fallback=lambda: (tool_val, [{"key": tool_val, "type": "default", "text": ""}]))
+    return resp if resp else (tool_val, [{"key": tool_val, "type": "default", "text": ""}])
+
+
+async def fetch_tenant_mcp_config(tenant_id: str) -> Optional[Dict[str, Any]]:
+    """테넌트 MCP 설정 조회. 실패 시 None."""
+    def _call():
+        client = get_db_client()
+        return client.table("tenants").select("mcp").eq("id", tenant_id).single().execute()
+    try:
+        resp = await _async_retry(_call, name="fetch_tenant_mcp_config", fallback=lambda: None)
+        return resp.data.get("mcp") if resp and resp.data else None
+    except Exception as e:
+        _emit_error("fetch_tenant_mcp_config 실패", e, raise_error=False)
+        return None
+
+
+# ------------------------------
+# 오류 상태 업데이트 (FAILED)
+# ------------------------------
+async def update_task_error(todo_id: str) -> None:
+    """작업 오류 상태 업데이트 (FAILED) - 로그 컬럼은 건드리지 않음"""
+    if not todo_id:
+        return
+    def _call():
+        client = get_db_client()
+        return (
+            client
+            .table('todolist')
+            .update({'draft_status': 'FAILED', 'consumer': None})
+            .eq('id', todo_id)
+            .execute()
+        )
+
+    await _async_retry(_call, name="update_task_error", fallback=lambda: None)

{process_gpt_agent_sdk-0.1.2 → process_gpt_agent_sdk-0.1.3}/processgpt_agent_sdk/server.py

@@ -13,11 +13,13 @@ from .core.database import (
 	fetch_form_types,
 	fetch_task_status,
 	fetch_tenant_mcp_config,
+    update_task_error,
 )
 
 from .utils.logger import handle_error as _emit_error, log as _emit_log
 from .utils.summarizer import summarize_async
 from .utils.event_handler import route_event
+from .utils.context_manager import set_context, reset_context
 
 
 class ProcessGPTAgentServer:
@@ -49,14 +51,23 @@ class ProcessGPTAgentServer:
 				todo_id = todo["id"]
 				_emit_log(f"[JOB START] todo_id={todo_id}")
 
-				prepared_data = await self._prepare_service_data(todo)
-				_emit_log(f"[RUN] 서비스 데이터 준비 완료 [todo_id={todo_id} agent={prepared_data.get('agent_orch','')}]")
+				try:
+					prepared_data = await self._prepare_service_data(todo)
+					_emit_log(f"[RUN] 서비스 데이터 준비 완료 [todo_id={todo_id} agent={prepared_data.get('agent_orch','')}]")
 
-				await self._execute_with_cancel_watch(todo, prepared_data)
-				_emit_log(f"[RUN] 서비스 실행 완료 [todo_id={todo_id} agent={prepared_data.get('agent_orch','')}]")
+					await self._execute_with_cancel_watch(todo, prepared_data)
+					_emit_log(f"[RUN] 서비스 실행 완료 [todo_id={todo_id} agent={prepared_data.get('agent_orch','')}]")
+				except Exception as job_err:
+					_emit_error("작업 처리 오류", job_err, raise_error=False)
+					try:
+						await update_task_error(str(todo_id))
+					except Exception as upd_err:
+						_emit_error("FAILED 상태 업데이트 실패", upd_err, raise_error=False)
+					# 다음 루프로 진행
+					continue
 				
 			except Exception as e:
-				_emit_error("폴링 루프 오류", e)
+				_emit_error("폴링 루프 오류", e, raise_error=False)
 				await asyncio.sleep(self.polling_interval)
 
 	def stop(self) -> None:
@@ -108,6 +119,17 @@ class ProcessGPTAgentServer:
 		context = ProcessGPTRequestContext(prepared_data)
 		event_queue = ProcessGPTEventQueue(todo)
 
+		# 실행 전 컨텍스트 변수 설정 (CrewAI 전역 리스너 등에서 활용)
+		try:
+			set_context(
+				todo_id=str(todo.get("id")),
+				proc_inst_id=str(todo.get("proc_inst_id") or ""),
+				crew_type=str(prepared_data.get("agent_orch") or ""),
+				form_id=str(prepared_data.get("form_id") or ""),
+			)
+		except Exception as e:
+			_emit_error("컨텍스트 설정 실패", e, raise_error=False)
+
 		_emit_log(f"[EXEC START] todo_id={todo.get('id')} agent={prepared_data.get('agent_orch','')}")
 		execute_task = asyncio.create_task(executor.execute(context, event_queue))
 		cancel_watch_task = asyncio.create_task(self._watch_cancellation(todo, executor, context, event_queue, execute_task))
@@ -121,14 +143,19 @@ class ProcessGPTAgentServer:
 				task.cancel()
 				
 		except Exception as e:
-			_emit_error("서비스 실행 오류", e)
+			_emit_error("서비스 실행 오류", e, raise_error=False)
 			cancel_watch_task.cancel()
 			execute_task.cancel()
 		finally:
+			# 컨텍스트 정리
+			try:
+				reset_context()
+			except Exception as e:
+				_emit_error("컨텍스트 리셋 실패", e, raise_error=False)
 			try:
 				await event_queue.close()
 			except Exception as e:
-				_emit_error("이벤트 큐 종료 실패", e)
+				_emit_error("이벤트 큐 종료 실패", e, raise_error=False)
 			_emit_log(f"[EXEC END] todo_id={todo.get('id')} agent={prepared_data.get('agent_orch','')}")
 
 	async def _watch_cancellation(self, todo: Dict[str, Any], executor: AgentExecutor, context: RequestContext, event_queue: EventQueue, execute_task: asyncio.Task) -> None:
@@ -145,16 +172,16 @@ class ProcessGPTAgentServer:
 				try:
 					await executor.cancel(context, event_queue)
 				except Exception as e:
-					_emit_error("취소 처리 실패", e)
+					_emit_error("취소 처리 실패", e, raise_error=False)
 				finally:
 					try:
 						execute_task.cancel()
 					except Exception as e:
-						_emit_error("실행 태스크 즉시 취소 실패", e)
+						_emit_error("실행 태스크 즉시 취소 실패", e, raise_error=False)
 					try:
 						await event_queue.close()
 					except Exception as e:
-						_emit_error("취소 후 이벤트 큐 종료 실패", e)
+						_emit_error("취소 후 이벤트 큐 종료 실패", e, raise_error=False)
 				break
 
 
@@ -189,17 +216,17 @@ class ProcessGPTEventQueue(EventQueue):
 			try:
 				super().enqueue_event(event)
 			except Exception as e:
-				_emit_error("이벤트 큐 삽입 실패", e)
+				_emit_error("이벤트 큐 삽입 실패", e, raise_error=False)
 
 			self._create_bg_task(route_event(self.todo, event), "route_event")
 		except Exception as e:
-			_emit_error("이벤트 저장 실패", e)
+			_emit_error("이벤트 저장 실패", e, raise_error=False)
 		
 	def task_done(self) -> None:
 		try:
 			_emit_log(f"태스크 완료: {self.todo['id']}")
 		except Exception as e:
-			_emit_error("태스크 완료 처리 실패", e)
+			_emit_error("태스크 완료 처리 실패", e, raise_error=False)
 
 	async def close(self) -> None:
 		pass
@@ -210,7 +237,7 @@ class ProcessGPTEventQueue(EventQueue):
 			def _cb(t: asyncio.Task):
 				exc = t.exception()
 				if exc:
-					_emit_error(f"백그라운드 태스크 오류({label})", exc)
+					_emit_error(f"백그라운드 태스크 오류({label})", exc, raise_error=False)
 			task.add_done_callback(_cb)
 		except Exception as e:
-			_emit_error(f"백그라운드 태스크 생성 실패({label})", e)
+			_emit_error(f"백그라운드 태스크 생성 실패({label})", e, raise_error=False)

{process_gpt_agent_sdk-0.1.2 → process_gpt_agent_sdk-0.1.3}/processgpt_agent_sdk/tools/safe_tool_loader.py

@@ -186,6 +186,6 @@ class SafeToolLoader:
 			try:
 				adapter.stop()
 			except Exception as e:
-				handle_error("툴종료오류", e, raise_error=True)
+				handle_error("툴종료오류", e, raise_error=False)
 		log("모든 MCPServerAdapter 연결 종료 완료")
 		cls.adapters.clear()

process_gpt_agent_sdk-0.1.3/processgpt_agent_sdk/utils/context_manager.py

@@ -0,0 +1,33 @@
+from __future__ import annotations
+
+from contextvars import ContextVar
+from typing import Optional
+
+
+todo_id_var: ContextVar[Optional[str]] = ContextVar("todo_id", default=None)
+proc_id_var: ContextVar[Optional[str]] = ContextVar("proc_id", default=None)
+crew_type_var: ContextVar[Optional[str]] = ContextVar("crew_type", default=None)
+form_key_var: ContextVar[Optional[str]] = ContextVar("form_key", default=None)
+form_id_var: ContextVar[Optional[str]] = ContextVar("form_id", default=None)
+
+
+def set_context(*, todo_id: Optional[str] = None, proc_inst_id: Optional[str] = None, crew_type: Optional[str] = None, form_key: Optional[str] = None, form_id: Optional[str] = None) -> None:
+    if todo_id is not None:
+        todo_id_var.set(todo_id)
+    if proc_inst_id is not None:
+        proc_id_var.set(proc_inst_id)
+    if crew_type is not None:
+        crew_type_var.set(crew_type)
+    if form_key is not None:
+        form_key_var.set(form_key)
+    if form_id is not None:
+        form_id_var.set(form_id)
+
+
+def reset_context() -> None:
+    todo_id_var.set(None)
+    proc_id_var.set(None)
+    crew_type_var.set(None)
+    form_key_var.set(None)
+    form_id_var.set(None)
+

process_gpt_agent_sdk-0.1.3/processgpt_agent_sdk/utils/crewai_event_listener.py

@@ -0,0 +1,201 @@
+from __future__ import annotations
+
+import os
+import json
+import uuid
+from datetime import datetime, timezone
+from typing import Any, Optional, Dict, List
+
+from crewai.utilities.events import CrewAIEventsBus, ToolUsageStartedEvent, ToolUsageFinishedEvent
+from crewai.utilities.events.task_events import TaskStartedEvent, TaskCompletedEvent
+
+from .logger import handle_error as _err, log as _log
+from .context_manager import todo_id_var, proc_id_var, crew_type_var, form_id_var, form_key_var
+from ..core.database import initialize_db, get_db_client
+
+
+class CrewAIEventLogger:
+    """CrewAI 이벤트 로거 - Supabase 전용"""
+
+    # =============================================================================
+    # Initialization
+    # =============================================================================
+    def __init__(self):
+        initialize_db()
+        self.supabase = get_db_client()
+        _log("CrewAIEventLogger 초기화 완료")
+
+    # =============================================================================
+    # Job ID Generation
+    # =============================================================================
+    def _generate_job_id(self, event_obj: Any, source: Any = None) -> str:
+        """이벤트 객체에서 Job ID 생성"""
+        try:
+            if hasattr(event_obj, "task") and hasattr(event_obj.task, "id"):
+                return str(event_obj.task.id)
+            if source and hasattr(source, "task") and hasattr(source.task, "id"):
+                return str(source.task.id)
+        except Exception:
+            pass
+        return "unknown"
+
+    # =============================================================================
+    # Record Creation
+    # =============================================================================
+    def _create_event_record(
+        self,
+        event_type: str,
+        data: Dict[str, Any],
+        job_id: str,
+        crew_type: str,
+        todo_id: Optional[str],
+        proc_inst_id: Optional[str],
+    ) -> Dict[str, Any]:
+        """이벤트 레코드 생성"""
+        return {
+            "id": str(uuid.uuid4()),
+            "job_id": job_id,
+            "todo_id": todo_id,
+            "proc_inst_id": proc_inst_id,
+            "event_type": event_type,
+            "crew_type": crew_type,
+            "data": data,
+            "timestamp": datetime.now(timezone.utc).isoformat(),
+        }
+
+    # =============================================================================
+    # Parsing Helpers
+    # =============================================================================
+    def _parse_json_text(self, text: str) -> Any:
+        """JSON 문자열을 객체로 파싱하거나 원본 반환"""
+        try:
+            return json.loads(text)
+        except:
+            return text
+
+    def _parse_output(self, output: Any) -> Any:
+        """output 또는 raw 텍스트를 파싱해 반환"""
+        if not output:
+            return ""
+        text = getattr(output, "raw", None) or (output if isinstance(output, str) else "")
+        return self._parse_json_text(text)
+
+    def _parse_tool_args(self, args_text: str) -> Optional[str]:
+        """tool_args에서 query 키 추출"""
+        try:
+            args = json.loads(args_text or "{}")
+            return args.get("query")
+        except Exception:
+            return None
+
+    # =============================================================================
+    # Formatting Helpers
+    # =============================================================================
+    def _format_plans_md(self, plans: List[Dict[str, Any]]) -> str:
+        """list_of_plans_per_task 형식을 Markdown 문자열로 변환"""
+        lines: List[str] = []
+        for idx, item in enumerate(plans or [], 1):
+            task = item.get("task", "")
+            plan = item.get("plan", "")
+            lines.append(f"## {idx}. {task}")
+            lines.append("")
+            if isinstance(plan, list):
+                for line in plan:
+                    lines.append(str(line))
+            elif isinstance(plan, str):
+                for line in plan.split("\n"):
+                    lines.append(line)
+            else:
+                lines.append(str(plan))
+            lines.append("")
+        return "\n".join(lines).strip()
+
+    # =============================================================================
+    # Data Extraction
+    # =============================================================================
+    def _extract_event_data(self, event_obj: Any, source: Any = None) -> Dict[str, Any]:
+        """이벤트 타입별 데이터 추출"""
+        etype = getattr(event_obj, "type", None) or type(event_obj).__name__
+        if etype == "task_started":
+            agent = getattr(getattr(event_obj, "task", None), "agent", None)
+            return {
+                "role": getattr(agent, "role", "Unknown"),
+                "goal": getattr(agent, "goal", "Unknown"),
+                "agent_profile": getattr(agent, "profile", None) or "/images/chat-icon.png",
+                "name": getattr(agent, "name", "Unknown"),
+            }
+        if etype == "task_completed":
+            result = self._parse_output(getattr(event_obj, "output", None))
+            if isinstance(result, dict) and "list_of_plans_per_task" in result:
+                md = self._format_plans_md(result.get("list_of_plans_per_task") or [])
+                return {"plans": md}
+            return {"result": result}
+
+        if etype in ("tool_usage_started", "tool_usage_finished") or str(etype).startswith("tool_"):
+            return {
+                "tool_name": getattr(event_obj, "tool_name", None),
+                "query": self._parse_tool_args(getattr(event_obj, "tool_args", "")),
+            }
+        return {"info": f"Event type: {etype}"}
+
+    # =============================================================================
+    # Event Saving
+    # =============================================================================
+    def _save_event(self, record: Dict[str, Any]) -> None:
+        """Supabase에 이벤트 레코드 저장 (간단 재시도 포함)"""
+        payload = json.loads(json.dumps(record, default=str))
+        for attempt in range(1, 4):
+            try:
+                self.supabase.table("events").insert(payload).execute()
+                return
+            except Exception as e:
+                if attempt < 3:
+                    _err("이벤트저장오류(재시도)", e, raise_error=False)
+                    # 지수 백오프: 0.3s, 0.6s
+                    import time
+                    time.sleep(0.3 * attempt)
+                    continue
+                _err("이벤트저장오류(최종)", e, raise_error=False)
+                return
+
+    # =============================================================================
+    # Event Handling
+    # =============================================================================
+    def on_event(self, event_obj: Any, source: Any = None) -> None:
+        """이벤트 수신부터 DB 저장까지 처리"""
+        etype = getattr(event_obj, "type", None) or type(event_obj).__name__
+        ALLOWED = {"task_started", "task_completed", "tool_usage_started", "tool_usage_finished"}
+        if etype not in ALLOWED:
+            return
+        try:
+            job_id = self._generate_job_id(event_obj, source)
+            data = self._extract_event_data(event_obj, source)
+            crew_type = crew_type_var.get() or "action"
+            rec = self._create_event_record(etype, data, job_id, crew_type, todo_id_var.get(), proc_id_var.get())
+            self._save_event(rec)
+            _log(f"[{etype}] [{job_id[:8]}] 저장 완료")
+        except Exception as e:
+            _err("이벤트처리오류", e, raise_error=False)
+
+
+
+class CrewConfigManager:
+    """글로벌 CrewAI 이벤트 리스너 등록 매니저"""
+    _registered_by_pid: set[int] = set()
+
+    def __init__(self) -> None:
+        self.logger = CrewAIEventLogger()
+        self._register_once_per_process()
+
+    def _register_once_per_process(self) -> None:
+        try:
+            pid = os.getpid()
+            if pid in self._registered_by_pid:
+                return
+            bus = CrewAIEventsBus()
+            for evt in (TaskStartedEvent, TaskCompletedEvent, ToolUsageStartedEvent, ToolUsageFinishedEvent):
+                bus.on(evt)(lambda source, event, logger=self.logger: logger.on_event(event, source))
+            self._registered_by_pid.add(pid)
+            _log("CrewAI event listeners 등록 완료")
+        except Exception as e:
+            _err("CrewAI 이벤트 버스 등록 실패", e, raise_error=False)

process_gpt_agent_sdk-0.1.3/processgpt_agent_sdk/utils/event_handler.py

@@ -0,0 +1,48 @@
+from __future__ import annotations
+
+import json
+import uuid
+from datetime import datetime, timezone
+from typing import Any, Dict
+
+from a2a.server.events import Event
+from .logger import handle_error as _emit_error, log as _emit_log
+from ..core.database import record_event, save_task_result
+
+
+def _event_to_dict(event: Event) -> Dict[str, Any]:
+	try:
+		if hasattr(event, "__dict__"):
+			return {k: v for k, v in event.__dict__.items() if not k.startswith("_")}
+		return {"event": str(event)}
+	except Exception as e:
+		_emit_error("event dict 변환 실패", e, raise_error=False)
+		return {"event": str(event)}
+
+
+async def route_event(todo: Dict[str, Any], event: Event) -> None:
+	"""이벤트(dict)와 출력(output)을 구분해 처리.
+
+	- "event": CrewAI 등에서 발생한 실행 이벤트 → events 테이블 저장
+	- "output": 실행 결과 → save_task_result를 통해 중간/최종 여부에 따라 저장
+	"""
+	try:
+		data = _event_to_dict(event)
+
+		# output 이벤트 처리
+		if data.get("type") == "output" or data.get("event_type") == "output":
+			payload = data.get("data") or data.get("payload") or {}
+			is_final = bool(payload.get("final") or payload.get("is_final"))
+			content = payload.get("content") if isinstance(payload, dict) else payload
+			await save_task_result(str(todo.get("id")), content, final=is_final)
+			return
+
+		# 일반 event 처리 (원형 + 타임스탬프)
+		normalized = {
+			"id": str(uuid.uuid4()),
+			"timestamp": datetime.now(timezone.utc).isoformat(),
+			**data,
+		}
+		await record_event(todo, normalized, event_type=str(data.get("type") or data.get("event_type") or "event"))
+	except Exception as e:
+		_emit_error("route_event 처리 실패", e, raise_error=False)

{process_gpt_agent_sdk-0.1.2 → process_gpt_agent_sdk-0.1.3}/processgpt_agent_sdk/utils/logger.py

@@ -1,30 +1,30 @@
-import logging
-import os
-import traceback
-from typing import Optional, Dict
-
-
-# Configure root logger only once (idempotent)
-if not logging.getLogger().handlers:
-	logging.basicConfig(
-		level=logging.INFO,
-		format="%(asctime)s %(levelname)s %(name)s - %(message)s",
-	)
-
-_logger = logging.getLogger("process-gpt-agent-framework")
-
-
-def log(message: str, level: int = logging.INFO) -> None:
-	spaced = os.getenv("LOG_SPACED", "1") != "0"
-	suffix = "\n" if spaced else ""
-	_logger.log(level, f"{message}{suffix}")
-
-
-def handle_error(title: str, error: Exception, *, raise_error: bool = False, extra: Optional[Dict] = None) -> None:
-	spaced = os.getenv("LOG_SPACED", "1") != "0"
-	suffix = "\n" if spaced else ""
-	context = f" | extra={extra}" if extra else ""
-	_logger.error(f"{title}: {error}{context}{suffix}")
-	_logger.error(traceback.format_exc())
-	if raise_error:
-		raise error
+import logging
+import os
+import traceback
+from typing import Optional, Dict
+
+
+# Configure root logger only once (idempotent)
+if not logging.getLogger().handlers:
+	logging.basicConfig(
+		level=logging.INFO,
+		format="%(asctime)s %(levelname)s %(name)s - %(message)s",
+	)
+
+_logger = logging.getLogger("process-gpt-agent-framework")
+
+
+def log(message: str, level: int = logging.INFO) -> None:
+	spaced = os.getenv("LOG_SPACED", "1") != "0"
+	suffix = "\n" if spaced else ""
+	_logger.log(level, f"{message}{suffix}")
+
+
+def handle_error(title: str, error: Exception, *, raise_error: bool = True, extra: Optional[Dict] = None) -> None:
+	spaced = os.getenv("LOG_SPACED", "1") != "0"
+	suffix = "\n" if spaced else ""
+	context = f" | extra={extra}" if extra else ""
+	_logger.error(f"{title}: {error}{context}{suffix}")
+	_logger.error(traceback.format_exc())
+	if raise_error:
+		raise error

{process_gpt_agent_sdk-0.1.2 → process_gpt_agent_sdk-0.1.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "process-gpt-agent-sdk"
-version = "0.1.2"
+version = "0.1.3"
 description = "Supabase 기반 이벤트/작업 폴링으로 A2A AgentExecutor를 실행하는 SDK"
 readme = "README.md"
 requires-python = ">=3.9"

process_gpt_agent_sdk-0.1.2/processgpt_agent_sdk/core/database.py

@@ -1,289 +0,0 @@
-import os
-import json
-import asyncio
-import socket
-import uuid
-from typing import Any, Dict, List, Optional, Tuple
-
-from dotenv import load_dotenv
-from supabase import Client, create_client
-import logging
-import random
-from typing import Callable, TypeVar
-
-T = TypeVar("T")
-
-from ..utils.logger import handle_error as _emit_error, log as _emit_log
-
-
-async def _async_retry(
-	fn: Callable[[], T],
-	*,
-	name: str,
-	retries: int = 3,
-	base_delay: float = 0.8,
-	fallback: Optional[Callable[[], T]] = None,
-) -> Optional[T]:
-	"""재시도 유틸(지수 백오프+jitter)."""
-	last_err: Optional[Exception] = None
-	for attempt in range(1, retries + 1):
-		try:
-			return await asyncio.to_thread(fn)
-		except Exception as e:
-			last_err = e
-			jitter = random.uniform(0, 0.3)
-			delay = base_delay * (2 ** (attempt - 1)) + jitter
-			_emit_log(f"{name} 재시도 {attempt}/{retries} (delay={delay:.2f}s): {e}", level=logging.WARNING)
-			await asyncio.sleep(delay)
-	_emit_log(f"{name} 최종 실패: {last_err}", level=logging.ERROR)
-	if fallback is not None:
-		try:
-			fb_val = fallback()
-			_emit_log(f"{name} 폴백 사용", level=logging.WARNING)
-			return fb_val
-		except Exception as e:
-			_emit_log(f"{name} 폴백 실패: {e}", level=logging.ERROR)
-	return None
-
-
-_supabase_client: Optional[Client] = None
-
-
-def initialize_db() -> None:
-	global _supabase_client
-	if _supabase_client is not None:
-		return
-	if os.getenv("ENV") != "production":
-		load_dotenv()
-	supabase_url = os.getenv("SUPABASE_URL") or os.getenv("SUPABASE_KEY_URL")
-	supabase_key = os.getenv("SUPABASE_KEY") or os.getenv("SUPABASE_ANON_KEY")
-	if not supabase_url or not supabase_key:
-		raise RuntimeError("SUPABASE_URL 및 SUPABASE_KEY가 필요합니다")
-	_supabase_client = create_client(supabase_url, supabase_key)
-
-
-def get_db_client() -> Client:
-	if _supabase_client is None:
-		raise RuntimeError("DB 미초기화: initialize_db() 먼저 호출")
-	return _supabase_client
-
-
-def get_consumer_id() -> str:
-	env_consumer = os.getenv("CONSUMER_ID")
-	if env_consumer:
-		return env_consumer
-	host = socket.gethostname()
-	pid = os.getpid()
-	return f"{host}:{pid}"
-
-
-async def polling_pending_todos(agent_orch: str, consumer: str) -> Optional[Dict[str, Any]]:
-	def _call():
-		client = get_db_client()
-		return client.rpc(
-			"fetch_pending_task",
-			{"p_agent_orch": agent_orch, "p_consumer": consumer, "p_limit": 1},
-		).execute()
-
-	resp = await _async_retry(_call, name="polling_pending_todos", fallback=lambda: None)
-	if not resp or not resp.data:
-		return None
-	return resp.data[0]
-
-
-async def fetch_todo_by_id(todo_id: str) -> Optional[Dict[str, Any]]:
-	if not todo_id:
-		return None
-	def _call():
-		client = get_db_client()
-		return (
-			client.table("todolist").select("*").eq("id", todo_id).single().execute()
-		)
-
-	resp = await _async_retry(_call, name="fetch_todo_by_id")
-	if not resp or not resp.data:
-		return None
-	return resp.data
-
-
-async def record_event(todo: Dict[str, Any], data: Dict[str, Any], event_type: Optional[str] = None) -> None:
-	def _call():
-		client = get_db_client()
-		payload: Dict[str, Any] = {
-			"id": str(uuid.uuid4()),
-			"job_id": todo.get("proc_inst_id") or str(todo.get("id")),
-			"todo_id": str(todo.get("id")),
-			"proc_inst_id": todo.get("proc_inst_id"),
-			"crew_type": todo.get("agent_orch"),
-			"data": data,
-		}
-		if event_type is not None:
-			payload["event_type"] = event_type
-		return client.table("events").insert(payload).execute()
-
-	resp = await _async_retry(_call, name="record_event", fallback=lambda: None)
-	if resp is None:
-		_emit_log("record_event 최종 실패(무시)", level=logging.WARNING)
-
-
-async def fetch_done_data(proc_inst_id: Optional[str]) -> List[Any]:
-	if not proc_inst_id:
-		return []
-	def _call():
-		client = get_db_client()
-		return client.rpc("fetch_done_data", {"p_proc_inst_id": proc_inst_id}).execute()
-
-	resp = await _async_retry(_call, name="fetch_done_data", fallback=lambda: None)
-	if not resp:
-		return []
-	return [row.get("output") for row in (resp.data or [])]
-
-
-async def save_task_result(todo_id: str, result: Any, final: bool = False) -> None:
-	def _call():
-		client = get_db_client()
-		payload = result if isinstance(result, (dict, list)) else json.loads(json.dumps(result))
-		return client.rpc(
-			"save_task_result",
-			{"p_todo_id": todo_id, "p_payload": payload, "p_final": final},
-		).execute()
-
-	await _async_retry(_call, name="save_task_result", fallback=lambda: None)
-
-
-async def fetch_human_response(job_id: str) -> Optional[Dict[str, Any]]:
-	def _call():
-		client = get_db_client()
-		return (
-			client.table("events")
-			.select("*")
-			.eq("job_id", job_id)
-			.eq("event_type", "human_response")
-			.execute()
-		)
-
-	resp = await _async_retry(_call, name="fetch_human_response")
-	if not resp or not resp.data:
-		return None
-	return resp.data[0]
-
-
-async def fetch_task_status(todo_id: str) -> Optional[str]:
-	def _call():
-		client = get_db_client()
-		return (
-			client.table("todolist").select("draft_status").eq("id", todo_id).single().execute()
-		)
-
-	resp = await _async_retry(_call, name="fetch_task_status")
-	if not resp or not resp.data:
-		return None
-	return resp.data.get("draft_status")
-
-
-async def fetch_all_agents() -> List[Dict[str, Any]]:
-	def _call():
-		client = get_db_client()
-		return (
-			client.table("users")
-			.select("id, username, role, goal, persona, tools, profile, model, tenant_id, is_agent")
-			.eq("is_agent", True)
-			.execute()
-		)
-
-	resp = await _async_retry(_call, name="fetch_all_agents")
-	rows = resp.data or [] if resp else []
-	normalized: List[Dict[str, Any]] = []
-	for row in rows:
-		normalized.append(
-			{
-				"id": row.get("id"),
-				"name": row.get("username"),
-				"role": row.get("role"),
-				"goal": row.get("goal"),
-				"persona": row.get("persona"),
-				"tools": row.get("tools") or "mem0",
-				"profile": row.get("profile"),
-				"model": row.get("model"),
-				"tenant_id": row.get("tenant_id"),
-			}
-		)
-	return normalized
-
-
-async def fetch_agent_data(user_ids: str) -> List[Dict[str, Any]]:
-	def _is_valid_uuid(value: str) -> bool:
-		try:
-			uuid.UUID(str(value))
-			return True
-		except Exception:
-			return False
-
-	raw_ids = [x.strip() for x in (user_ids or "").split(",") if x.strip()]
-	valid_ids = [x for x in raw_ids if _is_valid_uuid(x)]
-
-	if not valid_ids:
-		return await fetch_all_agents()
-
-	def _call():
-		client = get_db_client()
-		resp = (
-			client
-			.table("users")
-			.select("id, username, role, goal, persona, tools, profile, model, tenant_id, is_agent")
-			.in_("id", valid_ids)
-			.eq("is_agent", True)
-			.execute()
-		)
-		rows = resp.data or []
-		normalized: List[Dict[str, Any]] = []
-		for row in rows:
-			normalized.append(
-				{
-					"id": row.get("id"),
-					"name": row.get("username"),
-					"role": row.get("role"),
-					"goal": row.get("goal"),
-					"persona": row.get("persona"),
-					"tools": row.get("tools") or "mem0",
-					"profile": row.get("profile"),
-					"model": row.get("model"),
-					"tenant_id": row.get("tenant_id"),
-				}
-			)
-		return normalized
-
-	result = await _async_retry(_call, name="fetch_agent_data", fallback=lambda: [])
-
-	if not result:
-		return await fetch_all_agents()
-
-	return result
-
-
-async def fetch_form_types(tool_val: str, tenant_id: str) -> Tuple[str, List[Dict[str, Any]]]:
-	def _call():
-		client = get_db_client()
-		form_id = tool_val[12:] if tool_val.startswith("formHandler:") else tool_val
-		resp = (
-			client.table("form_def").select("fields_json").eq("id", form_id).eq("tenant_id", tenant_id).execute()
-		)
-		fields_json = resp.data[0].get("fields_json") if resp.data else None
-		if not fields_json:
-			return form_id, [{"key": form_id, "type": "default", "text": ""}]
-		return form_id, fields_json
-
-	resp = await _async_retry(_call, name="fetch_form_types", fallback=lambda: (tool_val, [{"key": tool_val, "type": "default", "text": ""}]))
-	return resp if resp else (tool_val, [{"key": tool_val, "type": "default", "text": ""}])
-
-
-async def fetch_tenant_mcp_config(tenant_id: str) -> Optional[Dict[str, Any]]:
-	def _call():
-		client = get_db_client()
-		return client.table("tenants").select("mcp").eq("id", tenant_id).single().execute()
-	try:
-		resp = await _async_retry(_call, name="fetch_tenant_mcp_config", fallback=lambda: None)
-		return resp.data.get("mcp") if resp and resp.data else None
-	except Exception as e:
-		_emit_error("fetch_tenant_mcp_config 실패", e, raise_error=False)
-		return None

process_gpt_agent_sdk-0.1.2/processgpt_agent_sdk/utils/event_handler.py

@@ -1,27 +0,0 @@
-from __future__ import annotations
-
-from typing import Any, Dict
-
-from a2a.server.events import Event
-from .logger import handle_error as _emit_error, log as _emit_log
-from ..core.database import record_event
-
-
-def _event_to_dict(event: Event) -> Dict[str, Any]:
-	try:
-		if hasattr(event, "__dict__"):
-			return {k: v for k, v in event.__dict__.items() if not k.startswith("_")}
-		return {"event": str(event)}
-	except Exception as e:
-		_emit_error("event dict 변환 실패", e)
-		return {"event": str(event)}
-
-
-async def route_event(todo: Dict[str, Any], event: Event) -> None:
-	"""이벤트를 dict으로 변환해 events 테이블에 기록.
-
-	- 복잡한 라우팅/분기는 추후 확장. 현재는 단일 events 테이블에 기록.
-	- event_type은 None으로 두거나, 필요 시 상위에서 지정하도록 추후 확장 가능.
-	"""
-	data = _event_to_dict(event)
-	await record_event(todo, data, event_type=None)