gohumanloop 0.0.2__py3-none-any.whl → 0.0.4__py3-none-any.whl

gohumanloop/providers/email_provider.py

@@ -12,6 +12,7 @@ import logging
 from typing import Dict, Any, Optional, List, Tuple
 from datetime import datetime
 from pydantic import SecretStr
+from concurrent.futures import ThreadPoolExecutor
 
 from gohumanloop.core.interface import ( HumanLoopResult, HumanLoopStatus, HumanLoopType
 )
@@ -79,6 +80,19 @@ class EmailProvider(BaseProvider):
 
         self._init_language_templates()
 
+        # Create thread pool for background service execution
+        self._executor = ThreadPoolExecutor(max_workers=10)
+
+
+    def __del__(self):
+        """析构函数，确保线程池被正确关闭"""
+        self._executor.shutdown(wait=False)
+
+        # 取消所有邮件检查任务
+        for task_key, future in list(self._mail_check_tasks.items()):
+            future.cancel()
+        self._mail_check_tasks.clear()
+
     def _init_language_templates(self):
         """初始化不同语言的模板和关键词"""
         if self.language == "zh":
@@ -132,7 +146,7 @@ class EmailProvider(BaseProvider):
                 "powered_by": "Powered by GoHumanLoop"
             }
         
-    async def _send_email(
+    async def _async_send_email(
         self, 
         to_email: str, 
         subject: str, 
@@ -195,7 +209,7 @@ class EmailProvider(BaseProvider):
             logger.exception(f"Unknown error occurred while sending email: {str(e)}")
             raise
             
-    async def _check_emails(self, conversation_id: str, request_id: str, recipient_email: str, subject: str):
+    async def _async_check_emails(self, conversation_id: str, request_id: str, recipient_email: str, subject: str):
         """Check email replies
         
         Args:
@@ -603,7 +617,7 @@ class EmailProvider(BaseProvider):
         
         return text_body, "\n".join(html_body)
         
-    async def request_humanloop(
+    async def async_request_humanloop(
         self,
         task_id: str,
         conversation_id: str,
@@ -678,7 +692,7 @@ class EmailProvider(BaseProvider):
        
         
         # 发送邮件
-        success = await self._send_email(
+        success = await self._async_send_email(
             to_email=recipient_email,
             subject=subject,
             body=body,
@@ -700,14 +714,15 @@ class EmailProvider(BaseProvider):
         self._subject_to_request[subject] = (conversation_id, request_id)
         
         # 创建邮件检查任务
-        check_task = asyncio.create_task(
-            self._check_emails(conversation_id, request_id, recipient_email, subject)
+        # 使用线程池执行邮件检查任务，而不是使用asyncio.create_task
+        self._mail_check_tasks[(conversation_id, request_id)] = self._executor.submit(
+            self._run_email_check_task, conversation_id, request_id, recipient_email, subject
         )
-        self._mail_check_tasks[(conversation_id, request_id)] = check_task
+        
         
         # 如果设置了超时，创建超时任务
         if timeout:
-            self._create_timeout_task(conversation_id, request_id, timeout)
+            await self._async_create_timeout_task(conversation_id, request_id, timeout)
             
         return HumanLoopResult(
             conversation_id=conversation_id,
@@ -715,8 +730,38 @@ class EmailProvider(BaseProvider):
             loop_type=loop_type,
             status=HumanLoopStatus.PENDING
         )
+
+    def _run_email_check_task(self, conversation_id: str, request_id: str, recipient_email: str, subject: str):
+        """Run email check task in thread
+        
+        Args:
+            conversation_id: Conversation ID
+            request_id: Request ID
+            recipient_email: Recipient email address
+            subject: Email subject
+        """
+        # Create new event loop
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
         
-    async def check_request_status(
+        try:
+            # Run email check in new event loop
+            loop.run_until_complete(
+                self._async_check_emails(conversation_id, request_id, recipient_email, subject)
+            )
+        except Exception as e:
+            logger.error(f"Email check task error: {str(e)}", exc_info=True)
+            # Update request status to error
+            self._update_request_status_error(conversation_id, request_id, f"Email check task error: {str(e)}")
+        finally:
+            # Close event loop
+            loop.close()
+            # Remove from task dictionary
+            if (conversation_id, request_id) in self._mail_check_tasks:
+                del self._mail_check_tasks[(conversation_id, request_id)]
+
+    
+    async def async_check_request_status(
         self,
         conversation_id: str,
         request_id: str
@@ -755,7 +800,7 @@ class EmailProvider(BaseProvider):
         
         return result
         
-    async def continue_humanloop(
+    async def async_continue_humanloop(
         self,
         conversation_id: str,
         context: Dict[str, Any],
@@ -855,7 +900,7 @@ class EmailProvider(BaseProvider):
         body, html_body = self._format_email_body(prompt, HumanLoopType.CONVERSATION, subject)
 
         # 发送邮件
-        success = await self._send_email(
+        success = await self._async_send_email(
             to_email=recipient_email,
             subject=subject,
             body=body,
@@ -876,16 +921,15 @@ class EmailProvider(BaseProvider):
             
         # 存储主题与请求的映射关系
         self._subject_to_request[subject] = (conversation_id, request_id)
-        
-        # 创建邮件检查任务
-        check_task = asyncio.create_task(
-            self._check_emails(conversation_id, request_id, recipient_email, subject)
-        )
-        self._mail_check_tasks[(conversation_id, request_id)] = check_task
 
+        # 使用线程池执行邮件检查任务，而不是使用asyncio.create_task
+        self._mail_check_tasks[(conversation_id, request_id)] = self._executor.submit(
+            self._run_email_check_task, conversation_id, request_id, recipient_email, subject
+        )
+        
         # 如果设置了超时，创建超时任务
         if timeout:
-            self._create_timeout_task(conversation_id, request_id, timeout)
+            await self._async_create_timeout_task(conversation_id, request_id, timeout)
             
         return HumanLoopResult(
             conversation_id=conversation_id,
@@ -894,7 +938,7 @@ class EmailProvider(BaseProvider):
             status=HumanLoopStatus.PENDING
         )
 
-    async def cancel_request(
+    async def async_cancel_request(
         self,
         conversation_id: str,
         request_id: str
@@ -916,9 +960,9 @@ class EmailProvider(BaseProvider):
             del self._mail_check_tasks[request_key]
             
         # 调用父类方法取消请求
-        return await super().cancel_request(conversation_id, request_id)
+        return await super().async_cancel_request(conversation_id, request_id)
         
-    async def cancel_conversation(
+    async def async_cancel_conversation(
         self,
         conversation_id: str
     ) -> bool:
@@ -938,7 +982,7 @@ class EmailProvider(BaseProvider):
                 del self._mail_check_tasks[request_key]
                 
         # 调用父类方法取消对话
-        return await super().cancel_conversation(conversation_id)
+        return await super().async_cancel_conversation(conversation_id)
 
     def _extract_user_reply_content(self, body: str) -> str:
         """Extract the actual reply content from the email, excluding quoted original email content

gohumanloop/providers/terminal_provider.py

@@ -1,8 +1,6 @@
 import asyncio
-from email import message
-import sys
-import json
-from typing import Dict, Any, Optional, List
+from concurrent.futures import ThreadPoolExecutor
+from typing import Dict, Any, Optional
 from datetime import datetime
 
 from gohumanloop.core.interface import (HumanLoopResult, HumanLoopStatus, HumanLoopType)
@@ -22,13 +20,27 @@ class TerminalProvider(BaseProvider):
             name: Provider name
             config: Configuration options, may include:
         """
-        super().__init__(name, config) 
+        super().__init__(name, config)
+
+        # Store running terminal input tasks
+        self._terminal_input_tasks = {}
+        # Create thread pool for background service execution
+        self._executor = ThreadPoolExecutor(max_workers=10)
+
+    def __del__(self):
+        """Destructor to ensure thread pool is properly closed"""
+        self._executor.shutdown(wait=False)
+
+        for task_key, future in list(self._terminal_input_tasks.items()):
+            future.cancel()
+        self._terminal_input_tasks.clear()
+
     def __str__(self) -> str:
         base_str = super().__str__()
         terminal_info = f"- Terminal Provider: Terminal-based human-in-the-loop implementation\n"
         return f"{terminal_info}{base_str}"
     
-    async def request_humanloop(
+    async def async_request_humanloop(
         self,
         task_id: str,
         conversation_id: str,
@@ -72,16 +84,32 @@ class TerminalProvider(BaseProvider):
             status=HumanLoopStatus.PENDING
         )
         
-        # Start async task to process user input
-        asyncio.create_task(self._process_terminal_interaction(conversation_id, request_id))
-        
+
+        self._terminal_input_tasks[(conversation_id, request_id)] = self._executor.submit(self._run_async_terminal_interaction, conversation_id, request_id)
+
         # Create timeout task if timeout is specified
         if timeout:
-            self._create_timeout_task(conversation_id, request_id, timeout)
+            await self._async_create_timeout_task(conversation_id, request_id, timeout)
         
         return result
-        
-    async def check_request_status(
+
+
+    def _run_async_terminal_interaction(self, conversation_id: str, request_id: str):
+        """Run asynchronous terminal interaction in a separate thread"""
+        # Create new event loop
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
+        
+        try:
+            # Run interaction processing in the new event loop
+            loop.run_until_complete(self._process_terminal_interaction(conversation_id, request_id))
+        finally:
+            loop.close()
+            # Remove from task dictionary
+            if (conversation_id, request_id) in self._terminal_input_tasks:
+                del self._terminal_input_tasks[(conversation_id, request_id)]
+
+    async def async_check_request_status(
         self,
         conversation_id: str,
         request_id: str
@@ -120,7 +148,7 @@ class TerminalProvider(BaseProvider):
         
         return result
         
-    async def continue_humanloop(
+    async def async_continue_humanloop(
         self,
         conversation_id: str,
         context: Dict[str, Any],
@@ -175,11 +203,11 @@ class TerminalProvider(BaseProvider):
         )
         
         # Start async task to process user input
-        asyncio.create_task(self._process_terminal_interaction(conversation_id, request_id))
+        self._terminal_input_tasks[(conversation_id, request_id)] = self._executor.submit(self._run_async_terminal_interaction, conversation_id, request_id)
         
         # Create timeout task if timeout is specified
         if timeout:
-            self._create_timeout_task(conversation_id, request_id, timeout)
+            await self._async_create_timeout_task(conversation_id, request_id, timeout)
         
         return result
     
@@ -205,14 +233,14 @@ class TerminalProvider(BaseProvider):
         
         # Handle different interaction types based on loop type
         if loop_type == HumanLoopType.APPROVAL:
-            await self._handle_approval_interaction(conversation_id, request_id, request_info)
+            await self._async_handle_approval_interaction(conversation_id, request_id, request_info)
         elif loop_type == HumanLoopType.INFORMATION:
-            await self._handle_information_interaction(conversation_id, request_id, request_info)
+            await self._async_handle_information_interaction(conversation_id, request_id, request_info)
         else:  # HumanLoopType.CONVERSATION
-            await self._handle_conversation_interaction(conversation_id, request_id, request_info)
+            await self._async_handle_conversation_interaction(conversation_id, request_id, request_info)
 
             
-    async def _handle_approval_interaction(self, conversation_id: str, request_id: str, request_info: Dict[str, Any]):
+    async def _async_handle_approval_interaction(self, conversation_id: str, request_id: str, request_info: Dict[str, Any]):
         """Handle approval type interaction
         
         Args:
@@ -225,7 +253,6 @@ class TerminalProvider(BaseProvider):
         # Execute blocking input() call in thread pool using run_in_executor
         loop = asyncio.get_event_loop()
         response = await loop.run_in_executor(None, input)
-
         # Process response
         response = response.strip().lower()
         if response in ["approve", "yes", "y", "同意", "批准"]:
@@ -239,7 +266,7 @@ class TerminalProvider(BaseProvider):
         else:
             print("\nInvalid input, please enter 'approve' or 'reject'")
             # Recursively handle approval interaction
-            await self._handle_approval_interaction(conversation_id, request_id, request_info)
+            await self._async_handle_approval_interaction(conversation_id, request_id, request_info)
             return
         
         # Update request information
@@ -250,7 +277,7 @@ class TerminalProvider(BaseProvider):
         
         print(f"\nYour decision has been recorded: {status.value}")
     
-    async def _handle_information_interaction(self, conversation_id: str, request_id: str, request_info: Dict[str, Any]):
+    async def _async_handle_information_interaction(self, conversation_id: str, request_id: str, request_info: Dict[str, Any]):
         """Handle information collection type interaction
         
         Args:
@@ -272,7 +299,7 @@ class TerminalProvider(BaseProvider):
         
         print("\nYour information has been recorded")
     
-    async def _handle_conversation_interaction(self, conversation_id: str, request_id: str, request_info: Dict[str, Any]):
+    async def _async_handle_conversation_interaction(self, conversation_id: str, request_id: str, request_info: Dict[str, Any]):
         """Handle conversation type interaction
         
         Args:
@@ -300,3 +327,48 @@ class TerminalProvider(BaseProvider):
         request_info["responded_at"] = datetime.now().isoformat()
         
         print("\nYour response has been recorded")
+
+    async def async_cancel_request(
+        self,
+        conversation_id: str,
+        request_id: str
+    ) -> bool:
+        """Cancel human-in-the-loop request
+        
+        Args:
+            conversation_id: Conversation identifier for multi-turn dialogues
+            request_id: Request identifier for specific interaction request
+            
+        Return:
+            bool: Whether cancellation was successful, True indicates successful cancellation,
+                 False indicates cancellation failed
+        """
+        request_key = (conversation_id, request_id)
+        if request_key in self._terminal_input_tasks:
+            self._terminal_input_tasks[request_key].cancel()
+            del self._terminal_input_tasks[request_key]
+            
+        # 调用父类方法取消请求
+        return await super().async_cancel_request(conversation_id, request_id)
+        
+    async def async_cancel_conversation(
+        self,
+        conversation_id: str
+    ) -> bool:
+        """Cancel the entire conversation
+        
+        Args:
+            conversation_id: Conversation identifier
+            
+        Returns:
+            bool: Whether cancellation was successful
+        """
+        # 取消所有相关的邮件检查任务
+        for request_id in self._get_conversation_requests(conversation_id):
+            request_key = (conversation_id, request_id)
+            if request_key in self._terminal_input_tasks:
+                self._terminal_input_tasks[request_key].cancel()
+                del self._terminal_input_tasks[request_key]
+                
+        # 调用父类方法取消对话
+        return await super().async_cancel_conversation(conversation_id)

gohumanloop/utils/utils.py

@@ -2,16 +2,46 @@ import asyncio
 import os
 from typing import Optional, Union
 from pydantic import SecretStr
+import warnings
+import logging
+
+logger = logging.getLogger(__name__)
+
 def run_async_safely(coro):
-    """同步环境下安全地运行异步协程，避免事件循环冲突"""
+    """
+    Safely run async coroutines in synchronous environment
+    Will raise RuntimeError if called in async environment
+    """
+    try:
+        loop = asyncio.get_running_loop()
+    except RuntimeError:  # No running event loop
+        loop = None
+    
+    if loop is not None:
+        raise RuntimeError(
+            "Detected running event loop! "
+            "You should use 'await' directly instead of run_async_safely(). "
+            "If you really need to call sync code from async context, "
+            "consider using asyncio.to_thread() or other proper methods."
+        )
+    
+    # Handle synchronous environment
     try:
         loop = asyncio.get_event_loop()
+        logger.info("Using existing event loop.")
     except RuntimeError:
-        # 如果没有事件循环，创建一个新的
         loop = asyncio.new_event_loop()
         asyncio.set_event_loop(loop)
+        own_loop = True
+        logger.info("Created new event loop.")
+    else:
+        own_loop = False
     
-    return loop.run_until_complete(coro)
+    try:
+        return loop.run_until_complete(coro)
+    finally:
+        if own_loop and not loop.is_closed():
+            loop.close()
 
 
 def get_secret_from_env(

{gohumanloop-0.0.2.dist-info → gohumanloop-0.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gohumanloop
-Version: 0.0.2
+Version: 0.0.4
 Summary: Perfecting AI workflows with human intelligence
 Author-email: gohumanloop authors <baird0917@163.com>
 Project-URL: repository, https://github.com/ptonlix/gohumanloop

{gohumanloop-0.0.2.dist-info → gohumanloop-0.0.4.dist-info}/RECORD

@@ -1,30 +1,30 @@
 gohumanloop/__init__.py,sha256=7_AkUtiG-_iozObldORElQS9mufxjZx_WfxuX0E5Af0,1845
 gohumanloop/__main__.py,sha256=zdGKN92H9SgwZfL4xLqPkE1YaiRcHhVg_GqC-H1VurA,75
 gohumanloop/adapters/__init__.py,sha256=alRiJPahmH5vIbiw7l6o3eFvEADVTkfWYIsXy5uPGSo,391
-gohumanloop/adapters/langgraph_adapter.py,sha256=W-Uu9KYzLX69pm3UgkK57lsbONb9DllQwRBdau_voZc,34058
+gohumanloop/adapters/langgraph_adapter.py,sha256=eJLJ_LgU7ZHwm2zSwlFeDIZxjbr8JgfNZiskv0TDOGg,34355
 gohumanloop/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gohumanloop/cli/main.py,sha256=54-0nwjaAeRH2WhbyO6pN-XADPQwk4_EUUvVWDWruLc,744
 gohumanloop/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gohumanloop/core/interface.py,sha256=WOWxlwsj3FSjLiZp_CW36AN_AQYc89PgdA9GZX1Irwc,13361
-gohumanloop/core/manager.py,sha256=QTpSa0GJEpmEd-f-FevqEsPQL9F8e8f0YLB5fPeLMio,23923
+gohumanloop/core/interface.py,sha256=UjeEBKGS_JjwIsT5sBzyq6_IhUkDFrUvBXqpkxkFrAA,22696
+gohumanloop/core/manager.py,sha256=MAgT5Sx1aLRBIb1mWxp-XJkQxEoibut8-TVtze8bWXQ,33068
 gohumanloop/manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gohumanloop/manager/ghl_manager.py,sha256=0FEV3brYz3jerkljDL2C0pt3_tAFsB019MWhyPiNDis,21909
+gohumanloop/manager/ghl_manager.py,sha256=Td54EcPg1r9Q5JfzS90QjzxiAhcMBYMigaERImLjp7M,21993
 gohumanloop/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gohumanloop/models/api_model.py,sha256=cNTXTlfI7yrTk_87Qf6ms0VtRXO2fYFJFLPTLy2dmQk,2853
 gohumanloop/models/glh_model.py,sha256=Ht93iCdLfVYz_nW-uW4bE5s0UoyKG3VEx9q-Gg8_tiY,870
 gohumanloop/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gohumanloop/providers/api_provider.py,sha256=WJ7z1dUkQ6xcURx0sAOt_sLFPSGaz2yttSvmNGhvI-c,24398
-gohumanloop/providers/base.py,sha256=ke9HUKCrr24U71UUdLKoKyTRujCG0cOGEevKDDcd5Nc,16863
-gohumanloop/providers/email_provider.py,sha256=U1dAXx3T-unDNQ4Kn7Q4xLnGiUfTIz6iw5YKRn4A2h0,42460
+gohumanloop/providers/api_provider.py,sha256=MPIe_BzXkZmbY8IbLhs04zDG-u2qw0PEy28ZWZxJQAI,25604
+gohumanloop/providers/base.py,sha256=en6Px3v-tPJz_zA8-cuT69YVoOyO1Av07kpgfeZoejc,22037
+gohumanloop/providers/email_provider.py,sha256=L_HWkWopJF-8h0e6sOFTZzu2FanBLvCFuXOVZpDahP4,44342
 gohumanloop/providers/ghl_provider.py,sha256=YdxTpRzitFhTXTbhUcMhQlPUs3kwEBd4wyXEcGK8Svk,2524
-gohumanloop/providers/terminal_provider.py,sha256=obe1Mjj3dlyIPlyViMj3bi4R9HhKXmGjingnfoyHY1I,11637
+gohumanloop/providers/terminal_provider.py,sha256=L0whpmmMEzI3shV3nOFl4MrEAXEeL06OrUT0GOVzvl0,14663
 gohumanloop/utils/__init__.py,sha256=idlE5ZNCELVNF9WIiyhtyzG9HJuQQCOlKeTr2aHJ2-Q,56
 gohumanloop/utils/context_formatter.py,sha256=v4vdgKNJCHjnTtIMq83AkyXwltL14vx-D4KahwcZhIQ,2171
 gohumanloop/utils/threadsafedict.py,sha256=0-Pmre2-lqHkUPal9wSaqh3fLaEtbo-OnJ3Wbi_knWE,9601
-gohumanloop/utils/utils.py,sha256=NU-qA5eGuuBjp2SJ49F2V8Gt8Rm1uV3AKM79LUeIcFY,1347
-gohumanloop-0.0.2.dist-info/licenses/LICENSE,sha256=-U5tuCcSpndQwSKWtZbFbazb-_AtZcZL2kQgHbSLg-M,1064
-gohumanloop-0.0.2.dist-info/METADATA,sha256=dG9y3LZsTdc3pTonB1fXwx5XZjY1Cedfk3O8bAiHbFA,1557
-gohumanloop-0.0.2.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-gohumanloop-0.0.2.dist-info/entry_points.txt,sha256=wM6jqRRD8bQXkvIduRVCuAJIlbyWg_F5EDXo5OZ_PwY,88
-gohumanloop-0.0.2.dist-info/top_level.txt,sha256=LvOXBqS6Mspmcuqp81uz0Vjx_m_YI0w06DOPCiI1BfY,12
-gohumanloop-0.0.2.dist-info/RECORD,,
+gohumanloop/utils/utils.py,sha256=3f53fHdWLPve-WTn9mGiz3SB0CE7l39caC5Dz0hm85U,2167
+gohumanloop-0.0.4.dist-info/licenses/LICENSE,sha256=-U5tuCcSpndQwSKWtZbFbazb-_AtZcZL2kQgHbSLg-M,1064
+gohumanloop-0.0.4.dist-info/METADATA,sha256=mM0-czwhVde-9FdxCAsEgeuXhGxW6f3OxeaTc9sIjNA,1557
+gohumanloop-0.0.4.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+gohumanloop-0.0.4.dist-info/entry_points.txt,sha256=wM6jqRRD8bQXkvIduRVCuAJIlbyWg_F5EDXo5OZ_PwY,88
+gohumanloop-0.0.4.dist-info/top_level.txt,sha256=LvOXBqS6Mspmcuqp81uz0Vjx_m_YI0w06DOPCiI1BfY,12
+gohumanloop-0.0.4.dist-info/RECORD,,

{gohumanloop-0.0.2.dist-info → gohumanloop-0.0.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.4.0)
+Generator: setuptools (80.7.1)
 Root-Is-Purelib: true
 Tag: py3-none-any