versionhq 1.1.9.2__tar.gz → 1.1.9.3__tar.gz

{versionhq-1.1.9.2 → versionhq-1.1.9.3}/.gitignore

@@ -1,7 +1,9 @@
+deploy.py
+destinations.py
+
 knowledge/
 memory/
 
-# composio.py
 memo.txt
 
 dist/

{versionhq-1.1.9.2 → versionhq-1.1.9.3}/PKG-INFO

@@ -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 → versionhq-1.1.9.3}/README.md

@@ -2,7 +2,7 @@
 
 ![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 → versionhq-1.1.9.3}/pyproject.toml

@@ -15,7 +15,7 @@ exclude = ["test*", "__pycache__"]
 
 [project]
 name = "versionhq"
-version = "1.1.9.2"
+version = "1.1.9.3"
 authors = [{ name = "Kuriko Iwai", email = "kuriko@versi0n.io" }]
 description = "LLM orchestration frameworks for model-agnostic AI agents that handle complex outbound workflows"
 readme = "README.md"
@@ -37,6 +37,9 @@ dependencies = [
   "wheel>=0.45.1",
   "python-dotenv>=1.0.0",
   "appdirs>=1.4.4",
+  "langchain>=0.3.14",
+  "langchain-openai>=0.2.14",
+  "composio-langchain>=0.6.12"
 ]
 classifiers = [
   "Programming Language :: Python",

{versionhq-1.1.9.2 → versionhq-1.1.9.3}/requirements.txt

@@ -5,6 +5,7 @@ aiohappyeyeballs==2.4.4
 aiohttp==3.11.11
     # via
     #   composio-core
+    #   langchain
     #   litellm
 aiosignal==1.3.2
     # via aiohttp
@@ -43,8 +44,12 @@ click==8.1.8
     #   uvicorn
 composio==0.1.0
     # via versionhq (pyproject.toml)
-composio-core==0.6.9
-    # via composio-openai
+composio-core==0.6.11.post1
+    # via
+    #   composio-langchain
+    #   composio-openai
+composio-langchain==0.6.12
+    # via versionhq (pyproject.toml)
 composio-openai==0.6.9
     # via versionhq (pyproject.toml)
 cryptography==44.0.0
@@ -69,6 +74,7 @@ httpcore==1.0.7
     # via httpx
 httpx==0.27.2
     # via
+    #   langsmith
     #   litellm
     #   openai
 huggingface-hub==0.27.0
@@ -91,6 +97,10 @@ jiter==0.8.2
     # via openai
 json-repair==0.35.0
     # via versionhq (pyproject.toml)
+jsonpatch==1.33
+    # via langchain-core
+jsonpointer==3.0.0
+    # via jsonpatch
 jsonref==1.1.0
     # via composio-core
 jsonschema==4.23.0
@@ -99,6 +109,27 @@ jsonschema==4.23.0
     #   litellm
 jsonschema-specifications==2024.10.1
     # via jsonschema
+langchain==0.3.14
+    # via
+    #   versionhq (pyproject.toml)
+    #   composio-langchain
+langchain-core==0.3.29
+    # via
+    #   langchain
+    #   langchain-openai
+    #   langchain-text-splitters
+langchain-openai==0.2.14
+    # via
+    #   versionhq (pyproject.toml)
+    #   composio-langchain
+langchain-text-splitters==0.3.4
+    # via langchain
+langchainhub==0.1.21
+    # via composio-langchain
+langsmith==0.2.10
+    # via
+    #   langchain
+    #   langchain-core
 litellm==1.56.5
     # via versionhq (pyproject.toml)
 markdown-it-py==3.0.0
@@ -113,13 +144,21 @@ multidict==6.1.0
     # via
     #   aiohttp
     #   yarl
+numpy==2.2.1
+    # via langchain
 openai==1.58.1
     # via
     #   versionhq (pyproject.toml)
     #   composio-openai
+    #   langchain-openai
     #   litellm
+orjson==3.10.13
+    # via langsmith
 packaging==24.2
-    # via huggingface-hub
+    # via
+    #   huggingface-hub
+    #   langchain-core
+    #   langchainhub
 paramiko==3.5.0
     # via composio-core
 propcache==0.2.1
@@ -132,7 +171,11 @@ pydantic==2.10.4
     # via
     #   versionhq (pyproject.toml)
     #   composio-core
+    #   composio-langchain
     #   fastapi
+    #   langchain
+    #   langchain-core
+    #   langsmith
     #   litellm
     #   openai
 pydantic-core==2.27.2
@@ -150,7 +193,10 @@ python-dotenv==1.0.1
     #   versionhq (pyproject.toml)
     #   litellm
 pyyaml==6.0.2
-    # via huggingface-hub
+    # via
+    #   huggingface-hub
+    #   langchain
+    #   langchain-core
 referencing==0.35.1
     # via
     #   jsonschema
@@ -164,8 +210,14 @@ requests==2.32.3
     #   versionhq (pyproject.toml)
     #   composio-core
     #   huggingface-hub
+    #   langchain
+    #   langchainhub
+    #   langsmith
     #   pysher
+    #   requests-toolbelt
     #   tiktoken
+requests-toolbelt==1.0.0
+    # via langsmith
 rich==13.9.4
     # via composio-core
 rpds-py==0.22.3
@@ -183,29 +235,42 @@ sniffio==1.3.1
     #   anyio
     #   httpx
     #   openai
+sqlalchemy==2.0.36
+    # via langchain
 starlette==0.41.3
     # via fastapi
+tenacity==9.0.0
+    # via
+    #   langchain
+    #   langchain-core
 tiktoken==0.8.0
-    # via litellm
+    # via
+    #   langchain-openai
+    #   litellm
 tokenizers==0.21.0
     # via litellm
 tqdm==4.67.1
     # via
     #   huggingface-hub
     #   openai
+types-requests==2.32.0.20241016
+    # via langchainhub
 typing==3.10.0.0
     # via versionhq (pyproject.toml)
 typing-extensions==4.12.2
     # via
     #   fastapi
     #   huggingface-hub
+    #   langchain-core
     #   openai
     #   pydantic
     #   pydantic-core
+    #   sqlalchemy
 urllib3==2.3.0
     # via
     #   requests
     #   sentry-sdk
+    #   types-requests
 uvicorn==0.34.0
     # via composio-core
 websocket-client==1.8.0

{versionhq-1.1.9.2 → versionhq-1.1.9.3}/src/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-1.1.9.2 → versionhq-1.1.9.3}/src/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-1.1.9.3/src/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 → versionhq-1.1.9.3}/src/versionhq.egg-info/PKG-INFO

@@ -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 → versionhq-1.1.9.3}/src/versionhq.egg-info/SOURCES.txt

@@ -53,7 +53,7 @@ src/versionhq/team/__init__.py
 src/versionhq/team/model.py
 src/versionhq/team/team_planner.py
 src/versionhq/tool/__init__.py
-src/versionhq/tool/composio.py
+src/versionhq/tool/composio_tool.py
 src/versionhq/tool/decorator.py
 src/versionhq/tool/model.py
 src/versionhq/tool/tool_handler.py

{versionhq-1.1.9.2 → versionhq-1.1.9.3}/src/versionhq.egg-info/requires.txt

@@ -12,3 +12,6 @@ setuptools>=75.6.0
 wheel>=0.45.1
 python-dotenv>=1.0.0
 appdirs>=1.4.4
+langchain>=0.3.14
+langchain-openai>=0.2.14
+composio-langchain>=0.6.12

versionhq-1.1.9.3/tests/tool/composio_test.py

@@ -0,0 +1,37 @@
+import os
+
+from versionhq.tool.composio_tool import ComposioHandler
+from versionhq.tool import ComposioAppName, ComposioAuthScheme, ComposioStatus, ComposioAction
+
+DEFAULT_MODEL_NAME = os.environ.get("LITELLM_MODEL_NAME", "gpt-3.5-turbo")
+LITELLM_API_KEY = os.environ.get("LITELLM_API_KEY")
+TEST_CONNECTED_ACCOUNT_ID = os.environ.get("TEST_CONNECTED_ACCOUNT_ID", "f79b1a07-db14-4aa5-959e-5713ccd18de2")
+
+
+def _test_connect_with_composio():
+    composio = ComposioHandler(
+        app_name=ComposioAppName.HUBSPOT,
+        auth_scheme=ComposioAuthScheme.OAUTH2,
+        connected_account_id=TEST_CONNECTED_ACCOUNT_ID
+    )
+    composio, status = composio._connect()
+    assert composio.connected_account_id is not None
+    assert status is not ComposioStatus.FAILED
+
+
+def _test_execute_action_on_langchain():
+    composio = ComposioHandler(
+        app_name=ComposioAppName.HUBSPOT,
+        auth_scheme=ComposioAuthScheme.OAUTH2,
+        connected_account_id=TEST_CONNECTED_ACCOUNT_ID
+    )
+    composio, status = composio._connect()
+    composio, res = composio.execute_composio_action_with_langchain(
+        action_name=ComposioAction.HUBSPOT_CREATE_PIPELINE_STAGE,
+        task_in_natural_language="create a demo pipeline"
+    )
+    assert status == ComposioStatus.ACTIVE.value
+    assert composio.connected_account_id == TEST_CONNECTED_ACCOUNT_ID
+    assert composio.tools is not None
+    assert res is not None
+    assert isinstance(res, str)