versionhq 1.1.9.2__py3-none-any.whl → 1.1.9.3__py3-none-any.whl

versionhq/__init__.py

@@ -15,10 +15,10 @@ from versionhq.llm.model import LLM
 from versionhq.task.model import Task, TaskOutput
 from versionhq.team.model import Team, TeamOutput
 from versionhq.tool.model import Tool
-from versionhq.tool.composio import Composio
+from versionhq.tool.composio_tool import ComposioHandler
 
 
-__version__ = "1.1.9.2"
+__version__ = "1.1.9.3"
 __all__ = [
     "Agent",
     "Customer",
@@ -34,5 +34,5 @@ __all__ = [
     "Team",
     "TeamOutput",
     "Tool",
-    "Composio"
+    "ComposioHandler"
 ]

versionhq/tool/__init__.py

@@ -40,10 +40,11 @@ composio_app_set = [
     (ComposioAppName.LINKEDIN, ComposioAuthScheme.OAUTH2),
 ]
 
-class COMPOSIO_STATUS(str, Enum):
-    INITIATED = "initiated"
-    ACTIVE = "active"
-    FAILED = "failed"
+class ComposioStatus(str, Enum):
+    INITIATED = "INITIATED"
+    ACTIVE = "ACTIVE"
+    FAILED = "FAILED"
+
 
 
 
@@ -51,3 +52,5 @@ class ComposioAction(str, Enum):
     """
     Enum to store composio's action that can be called via `Actions.xxx`
     """
+    # HUBSPOT_INITIATE_DATA_IMPORT_PROCESS = "hubspot_initate_date_import_process"
+    HUBSPOT_CREATE_PIPELINE_STAGE = "hubspot_create_pipeline_stage"

versionhq/tool/composio_tool.py

@@ -0,0 +1,191 @@
+import os
+import uuid
+from abc import ABC
+from dotenv import load_dotenv
+from typing import Any, Callable, Type, get_args, get_origin, Optional, Tuple, Dict
+from typing_extensions import Self
+
+from pydantic import BaseModel, Field, model_validator, field_validator, UUID4, PrivateAttr
+from pydantic_core import PydanticCustomError
+
+from composio import ComposioToolSet
+from composio_langchain import action
+
+from versionhq.tool import ComposioAppName, ComposioAuthScheme, composio_app_set, ComposioStatus, ComposioAction
+from versionhq._utils.logger import Logger
+from versionhq._utils.cache_handler import CacheHandler
+
+load_dotenv(override=True)
+
+DEFAULT_REDIRECT_URL = os.environ.get("DEFAULT_REDIRECT_URL", None)
+DEFAULT_USER_ID = os.environ.get("DEFAULT_USER_ID", None)
+OPENAI_API_KEY = os.environ.get("OPENAI_API_KEY", None)
+
+
+class ComposioHandler(ABC, BaseModel):
+    """
+    A class to handle connecting account with Composio and executing actions using Composio ecosystem.
+    `connected_account_id` is set up per `app_name` to call the actions on the given app. i.e., salesforce
+    """
+
+    _logger: Logger = PrivateAttr(default_factory=lambda: Logger(verbose=True))
+    _cache: CacheHandler = PrivateAttr(default_factory=lambda: CacheHandler())
+
+    id: UUID4 = Field(default_factory=uuid.uuid4, frozen=True)
+    app_name: str = Field(default=ComposioAppName.HUBSPOT, max_length=128, description="app name defined by composio")
+    user_id: str = Field(default=DEFAULT_USER_ID, description="composio entity id")
+    auth_scheme: str = Field(default=ComposioAuthScheme.OAUTH2)
+    redirect_url: str = Field(default=DEFAULT_REDIRECT_URL, description="redirect url after successful oauth2 connection")
+    connected_account_id: str = Field(
+        default=None,
+        description="store the client id generated by composio after auth validation. use the id to connect with a given app and execute composio actions"
+    )
+    tools: Any = Field(default=None, descritpion="retrieved composio tools")
+
+    @field_validator("id", mode="before")
+    @classmethod
+    def _deny_user_set_id(cls, v: Optional[UUID4]) -> None:
+        if v:
+            raise PydanticCustomError("may_not_set_field", "This field is not to be set by the user.", {})
+
+
+    @model_validator(mode="after")
+    def validate_app_name(self):
+        if self.app_name not in ComposioAppName:
+            raise PydanticCustomError("no_app_name", f"The given app name {self.app_name} is not valid.", {})
+
+        return self
+
+
+    @model_validator(mode="after")
+    def validate_auth_scheme(self):
+        """
+        Raise error when the client uses auth scheme unavailable for the app.
+        """
+        app_set = next(filter(lambda tup: self.app_name in tup, composio_app_set), None)
+        if not app_set:
+            raise  PydanticCustomError("no_app_set", f"The app set of {self.app_name} is missing.", {})
+
+        else:
+            acceptable_auth_scheme = next(filter(lambda item: self.auth_scheme in item, app_set), None)
+            if acceptable_auth_scheme is None:
+                raise  PydanticCustomError("invalid_auth_scheme", f"The app {self.app_name} must have different auth_scheme.", {})
+
+        return self
+
+
+    def _setup_langchain_toolset(self, metadata: Dict[str, Any] = dict()):
+        """
+        Composio toolset on LangChain for action execution using LLM.
+        """
+        from composio_langchain import ComposioToolSet
+        return ComposioToolSet(api_key=os.environ.get("COMPOSIO_API_KEY"), metadata={**metadata})
+
+
+    def _connect(
+            self, token: Optional[str] = None, api_key: Optional[str] = None, connected_account_id: str = None
+        ) -> Tuple[Self | str | Any]:
+        """
+        Send connection request to Composio, retrieve `connected_account_id`, and proceed with OAuth process of the given app to activate the connection.
+        """
+
+        connection_request, connected_account = None, None
+        connected_account_id = connected_account_id or self.connected_account_id
+        if connected_account_id:
+            connected_account = self.toolset.get_connected_account(id=connected_account_id)
+
+            if connected_account and connected_account.status == ComposioStatus.ACTIVE.value:
+                return self, ComposioStatus.ACTIVE.value
+
+        if not self.user_id:
+            raise PydanticCustomError("entity_id_missing", "Need entity_id to connect with the tool", {})
+
+        if self.auth_scheme == ComposioAuthScheme.API_KEY:
+            collected_from_user = {}
+            collected_from_user["api_key"] = api_key
+            connection_request = self.toolset.initiate_connection(
+                connected_account_params = collected_from_user,
+                app=self.app_name,
+                entity_id=self.user_id,
+                auth_scheme=self.auth_scheme,
+            )
+
+        if self.auth_scheme == ComposioAuthScheme.BEARER_TOKEN:
+            collected_from_user = {}
+            collected_from_user["token"] = token
+            connection_request = self.toolset.initiate_connection(
+                connected_account_params = collected_from_user,
+                app=self.app_name,
+                entity_id=self.user_id,
+                auth_scheme=self.auth_scheme,
+            )
+
+        if self.auth_scheme == ComposioAuthScheme.OAUTH2:
+            connection_request = self.toolset.initiate_connection(
+                app=self.app_name,
+                redirect_url = self.redirect_url, # clients will be redirected to this url after successful auth.
+                entity_id=self.user_id,
+                auth_scheme=self.auth_scheme,
+            )
+
+        if connection_request.connectionStatus == ComposioStatus.FAILED.value:
+            self._logger.log(level="error", message="Connection to composio failed.", color="red")
+            raise PydanticCustomError("connection_failed", "Connection to composio has failed", {})
+
+
+        connected_account = self.toolset.get_connected_account(id=connection_request.connectedAccountId)
+        # Note: connected_account.id === connection_request.connectedAccountId === self.connected_account_id
+
+        if connected_account.status == ComposioStatus.ACTIVE.value:
+            setattr(self.toolset, "entity_id", self.user_id)
+            self.connected_account_id = connection_request.connectedAccountId
+
+        elif connected_account.status == ComposioStatus.INITIATED.value:
+            setattr(self.toolset, "entity_id", self.user_id)
+            self.connected_account_id = connection_request.connectedAccountId
+
+            if connection_request.redirectUrl:
+                import webbrowser
+                webbrowser.open(connection_request.redirectUrl)
+
+        else:
+            self._logger.log(level="error", message="The account is invalid.", color="red")
+            raise PydanticCustomError("connection_failed", "Connection to composio has failed", {})
+
+        return self, connected_account.status if connected_account else connection_request.connectionStatus
+
+
+    def execute_composio_action_with_langchain(self, action_name: str | ComposioAction, task_in_natural_language: str) -> Tuple[Self, str]:
+        """
+        Execute Composio's Action using Langchain's agent ecosystem.
+        """
+        from langchain import hub
+        from langchain_openai import ChatOpenAI
+        from langchain.agents import create_openai_functions_agent, AgentExecutor
+        from composio_langchain import Action
+
+        action_name = action_name.value if isinstance(action_name, ComposioAction) else action_name
+        action = Action(action_name)
+        metadata = { action:  { "OPENAI_API_KEY": OPENAI_API_KEY } }
+        toolset = self._setup_langchain_toolset(metadata=metadata)
+        tools = toolset.get_tools(actions=[action_name,], entity_id=self.user_id)
+        if not tools:
+            self._logger.log(level="error", message=f"Tools related to {action_name} are not found on Langchain", color="red")
+            raise PydanticCustomError("tool_not_found", "Tools not found on Langchain", {})
+
+        self.tools = tools
+        llm = ChatOpenAI()
+        prompt = hub.pull("hwchase17/openai-functions-agent")
+        agent = create_openai_functions_agent(llm, tools, prompt)
+        agent_executor = AgentExecutor(agent=agent, tools=tools, verbose=True)
+        result = agent_executor.invoke(dict(input=task_in_natural_language))
+        return self, result["output"]
+
+
+    @property
+    def toolset(self) -> ComposioToolSet:
+        return ComposioToolSet(api_key=os.environ.get("COMPOSIO_API_KEY"))
+
+
+    def __name__(self):
+        return self.app_name

{versionhq-1.1.9.2.dist-info → versionhq-1.1.9.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: versionhq
-Version: 1.1.9.2
+Version: 1.1.9.3
 Summary: LLM orchestration frameworks for model-agnostic AI agents that handle complex outbound workflows
 Author-email: Kuriko Iwai <kuriko@versi0n.io>
 License: MIT License
@@ -52,12 +52,15 @@ Requires-Dist: setuptools>=75.6.0
 Requires-Dist: wheel>=0.45.1
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: appdirs>=1.4.4
+Requires-Dist: langchain>=0.3.14
+Requires-Dist: langchain-openai>=0.2.14
+Requires-Dist: composio-langchain>=0.6.12
 
 # Overview
 
 ![MIT license](https://img.shields.io/badge/License-MIT-green)
 [![Publisher](https://github.com/versionHQ/multi-agent-system/actions/workflows/publish.yml/badge.svg)](https://github.com/versionHQ/multi-agent-system/actions/workflows/publish.yml)
-![PyPI](https://img.shields.io/badge/PyPI-v1.1.7.9-blue)
+![PyPI](https://img.shields.io/badge/PyPI-v1.1.9.3-blue)
 ![python ver](https://img.shields.io/badge/Python-3.12/3.13-purple)
 ![pyenv ver](https://img.shields.io/badge/pyenv-2.5.0-orange)
 

{versionhq-1.1.9.2.dist-info → versionhq-1.1.9.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-versionhq/__init__.py,sha256=EsxPGTpj4pzGKPFd3wdJLr3zDbMpJDoSXkpz4OKuEks,931
+versionhq/__init__.py,sha256=-0hi_ADxpAQM8is-cYDuL5N9F3c4CsqGFYC5txzYx0U,950
 versionhq/_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 versionhq/_utils/cache_handler.py,sha256=3-lw_5ZMWC8hnPAkSQULJ2V1FvZZ-wg9mQaUJGSOjI8,403
 versionhq/_utils/i18n.py,sha256=TwA_PnYfDLA6VqlUDPuybdV9lgi3Frh_ASsb_X8jJo8,1483
@@ -31,13 +31,13 @@ versionhq/task/model.py,sha256=EbgYHLNq8l1zfRDnF-yEcuSZ0aNvzbRmHYgfVyJq84c,19910
 versionhq/team/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 versionhq/team/model.py,sha256=E52OUVzUtvR--51SFRJos3JdYKri1t2jbvvzoOvShQc,20181
 versionhq/team/team_planner.py,sha256=uzX2yed7A7gNSs6qH5jIq2zXMVF5BwQQ4HPATsB9DSQ,3675
-versionhq/tool/__init__.py,sha256=oU2Y84b7vywWq1xmFaBdXdH8Y9lGv7dmk2LEcj4dL-s,1692
-versionhq/tool/composio.py,sha256=Uh9lwk5f47hJq7YaY3ctjEYJzzBm12GTtvFUuaK7KO4,6253
+versionhq/tool/__init__.py,sha256=FvBuEXsOQUYnN7RTFxT20kAkiEYkxWKkiVtgpqOzKZQ,1843
+versionhq/tool/composio_tool.py,sha256=BJqaA1NhV0BT9AdY7OLCGpsAI3VEuCKnOS6D9vuU4zQ,8630
 versionhq/tool/decorator.py,sha256=W_WjzZy8y43AoiFjHLPUQfNipmpOPe-wQknCWloPwmY,1195
 versionhq/tool/model.py,sha256=cWfLQVjNkag5cYYqhABBK7-jcpl0UJQWuhDciG3MtPQ,8116
 versionhq/tool/tool_handler.py,sha256=A3zUkZkx4JEpFHI2uBkHDpzWfADw-bCYUQhgm6rpITM,1569
-versionhq-1.1.9.2.dist-info/LICENSE,sha256=7CCXuMrAjPVsUvZrsBq9DsxI2rLDUSYXR_qj4yO_ZII,1077
-versionhq-1.1.9.2.dist-info/METADATA,sha256=NJvqqKMP4sCZG42GkTsmP8UTbzd_btKgWyjORAHO2-s,15955
-versionhq-1.1.9.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-versionhq-1.1.9.2.dist-info/top_level.txt,sha256=DClQwxDWqIUGeRJkA8vBlgeNsYZs4_nJWMonzFt5Wj0,10
-versionhq-1.1.9.2.dist-info/RECORD,,
+versionhq-1.1.9.3.dist-info/LICENSE,sha256=7CCXuMrAjPVsUvZrsBq9DsxI2rLDUSYXR_qj4yO_ZII,1077
+versionhq-1.1.9.3.dist-info/METADATA,sha256=MiNTSV--oEyOAWcxDsqOMRvI37Ys8dmIuzI6gSg3p1s,16070
+versionhq-1.1.9.3.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
+versionhq-1.1.9.3.dist-info/top_level.txt,sha256=DClQwxDWqIUGeRJkA8vBlgeNsYZs4_nJWMonzFt5Wj0,10
+versionhq-1.1.9.3.dist-info/RECORD,,

{versionhq-1.1.9.2.dist-info → versionhq-1.1.9.3.dist-info}/WHEEL

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

versionhq/tool/composio.py

@@ -1,161 +0,0 @@
-import os
-import uuid
-from abc import ABC
-from dotenv import load_dotenv
-from typing import Any, Callable, Type, get_args, get_origin, Optional, Tuple
-
-from pydantic import BaseModel, Field, model_validator, field_validator, UUID4, PrivateAttr
-from pydantic_core import PydanticCustomError
-
-from composio import ComposioToolSet, Action, App, action
-
-from versionhq.tool import ComposioAppName, ComposioAuthScheme, composio_app_set, COMPOSIO_STATUS
-from versionhq._utils.logger import Logger
-from versionhq._utils.cache_handler import CacheHandler
-
-load_dotenv(override=True)
-
-DEFAULT_REDIRECT_URL = os.environ.get("DEFAULT_REDIRECT_URL", None)
-DEFAULT_USER_ID = os.environ.get("DEFAULT_USER_ID", None)
-
-
-class Composio(ABC, BaseModel):
-    """
-    Class to handle composio tools.
-    """
-
-    _logger: Logger = PrivateAttr(default_factory=lambda: Logger(verbose=True))
-    _cache: CacheHandler
-
-    id: UUID4 = Field(default_factory=uuid.uuid4, frozen=True)
-    app_name: str = Field(default=ComposioAppName.HUBSPOT)
-    user_id: str = Field(default=DEFAULT_USER_ID)
-    auth_scheme: str = Field(default=ComposioAuthScheme.OAUTH2)
-    redirect_url: str = Field(default=DEFAULT_REDIRECT_URL, description="redirect url after successful oauth2 connection")
-    connect_request_id: str = Field(default=None, description="store the client's composio id to connect with the app")
-
-    @property
-    def toolset(self) -> ComposioToolSet:
-        return ComposioToolSet(api_key=os.environ.get("COMPOSIO_API_KEY"))
-
-
-    def __name__(self):
-        return self.app_name
-
-
-    @field_validator("id", mode="before")
-    @classmethod
-    def _deny_user_set_id(cls, v: Optional[UUID4]) -> None:
-        if v:
-            raise PydanticCustomError("may_not_set_field", "This field is not to be set by the user.", {})
-
-
-    # @model_validator("user_id", mode="before")
-    # @classmethod
-    # def _deny_no_user_id(cls, v: Optional[str]) -> None:
-    #     if v is None:
-    #         raise PydanticCustomError("user_id_missing", "Need user_id to connect with the tool", {})
-
-
-    @model_validator(mode="after")
-    def validate_app_name(self):
-        if self.app_name not in ComposioAppName:
-            raise PydanticCustomError("no_app_name", f"The app name {self.app_name} is not valid.", {})
-
-        return self
-
-
-    @model_validator(mode="after")
-    def validate_auth_scheme(self):
-        """
-        Raise error when the client uses auth scheme unavailable for the app.
-        """
-        app_set = next(filter(lambda tup: self.app_name in tup, composio_app_set), None)
-        if not app_set:
-            raise  PydanticCustomError("no_app_set", f"The app set of {self.app_name} is missing.", {})
-
-        else:
-            acceptable_auth_scheme = next(filter(lambda item: self.auth_scheme in item, app_set), None)
-            if acceptable_auth_scheme is None:
-                raise  PydanticCustomError("invalid_auth_scheme", f"The app {self.app_name} must have different auth_scheme.", {})
-
-        return self
-
-
-    # connect with composio to use the tool
-    def connect(self, token: Optional[str] = None, api_key: Optional[str] = None) -> Tuple[str | Any]:
-        """
-        Connect with Composio, retrieve `connect_request_id`, and validate the connection.
-        """
-
-        if not self.user_id:
-            raise PydanticCustomError("user_id_missing", "Need user_id to connect with the tool", {})
-
-
-        connection_request, connected_account = None, None
-
-        if self.auth_scheme == ComposioAuthScheme.API_KEY:
-            collected_from_user = {}
-            collected_from_user["api_key"] = api_key
-            connection_request = self.toolset.initiate_connection(
-                connected_account_params = collected_from_user,
-                app=self.app_name,
-                entity_id=self.user_id,
-                auth_scheme=self.auth_scheme,
-            )
-
-        if self.auth_scheme == ComposioAuthScheme.BEARER_TOKEN:
-            collected_from_user = {}
-            collected_from_user["token"] = token
-            connection_request = self.toolset.initiate_connection(
-                connected_account_params = collected_from_user,
-                app=self.app_name,
-                entity_id=self.user_id,
-                auth_scheme=self.auth_scheme,
-            )
-
-        if self.auth_scheme == ComposioAuthScheme.OAUTH2:
-            connection_request = self.toolset.initiate_connection(
-                app=self.app_name,
-                redirect_url = self.redirect_url, # clients will be redirected to this url after successful auth.
-                entity_id=self.user_id,
-                auth_scheme=self.auth_scheme,
-            )
-
-        # connection_request.wait_until_active(self.toolset.client, timeout=60)
-
-        if connection_request.connectionStatus is not COMPOSIO_STATUS.FAILED:
-            self.connect_request_id = connection_request.connectedAccountId
-            connected_account = self.toolset.get_connected_account(id=self.connect_request_id)
-
-            if connected_account.status is not COMPOSIO_STATUS.FAILED:
-                setattr(self.toolset, "entity_id", self.user_id)
-
-            else:
-                self._logger.log(level="error", message="The account is not valid.", color="red")
-
-        else:
-            self._logger.log(level="error", message="Connection to composio failed.", color="red")
-
-        return connected_account, connected_account.status if connected_account else connection_request.connectionStatus
-
-
-
-
-    # @action(toolname=ComposioAppName.HUBSPOT)
-    # def deploy(self, param1: str, param2: str, execute_request: Callable) -> str:
-    #     """
-    #     Define custom actions
-    #     my custom action description which will be passed to llm
-
-    #     :param param1: param1 description which will be passed to llm
-    #     :param param2: param2 description which will be passed to llm
-    #     :return info: return description
-    #     """
-
-    #     response = execute_request(
-    #         "/my_action_endpoint",
-    #         "GET",
-    #         {} # body can be added here
-    #     )    # execute requests by appending credentials to the request
-    #     return str(response) # complete auth dict is available for local use if needed