chore: small cleanups

python/composio/client/__init__.py

@@ -1,5 +1,3 @@
-# fmt: off
-
 """
 Composio SDK client.
 """
@@ -63,7 +61,7 @@ def __init__(
         self,
         api_key: t.Optional[str] = None,
         base_url: t.Optional[str] = None,
-        runtime: t.Optional[str] = None
+        runtime: t.Optional[str] = None,
     ) -> None:
         """
         Initialize Composio SDK client
@@ -98,12 +96,10 @@ def api_key(self) -> str:
             cache_dir = Path.home() / LOCAL_CACHE_DIRECTORY_NAME
             user_data_path = cache_dir / USER_DATA_FILE_NAME
             user_data = (
-                UserData.load(path=user_data_path)
-                if user_data_path.exists() else None
+                UserData.load(path=user_data_path) if user_data_path.exists() else None
             )
             env_api_key = (
-                (user_data.api_key if user_data else None)
-                or os.environ.get(ENV_COMPOSIO_API_KEY)
+                user_data.api_key if user_data else os.environ.get(ENV_COMPOSIO_API_KEY)
             )
             if env_api_key:
                 self._api_key = env_api_key
@@ -262,7 +258,7 @@ def execute(
                 entity_id=self.id,
                 session_id=session_id,
                 text=text,
-                auth=auth
+                auth=auth,
             )
 
         connected_account = self.get_connection(
@@ -277,7 +273,7 @@ def execute(
             connected_account=connected_account.id,
             session_id=session_id,
             text=text,
-            auth=auth
+            auth=auth,
         )
 
     def get_connection(

python/composio/client/endpoints.py

@@ -56,13 +56,9 @@ def __call__(self, queries: t.Dict[str, str]) -> "Endpoint":
         if len(queries) == 0:
             return self
 
-        endpoint = self.endpoint
-        endpoint += "?"
-        for key, value in queries.items():
-            endpoint += (
-                f"{urllib.parse.quote_plus(key)}={urllib.parse.quote_plus(value)}&"
-            )
-        return Endpoint(endpoint=endpoint[:-1])
+        return Endpoint(
+            urllib.parse.urljoin(self.endpoint, "?" + urllib.parse.urlencode(queries))
+        )
 
 
 class _V1(Endpoint):

python/composio/tools/toolset.py

@@ -18,7 +18,6 @@
 
 import typing_extensions as te
 from pydantic import BaseModel
-from pydantic.v1.main import BaseModel as V1BaseModel
 
 from composio import Action, ActionType, App, AppType, TagType
 from composio.client import Composio, Entity
@@ -579,9 +578,6 @@ def _serialize_execute_params(self, param: ParamType) -> ParamType:
         if isinstance(param, BaseModel):
             return param.model_dump_json(exclude_none=True)  # type: ignore
 
-        if isinstance(param, V1BaseModel):
-            return param.dict(exclude_none=True)  # type: ignore
-
         if isinstance(param, list):
             return [self._serialize_execute_params(p) for p in param]  # type: ignore
 

python/composio/utils/pydantic.py

@@ -1,12 +1,7 @@
-import typing as t
-
 import pydantic
-import pydantic.v1.error_wrappers
 
 
-def parse_pydantic_error(
-    e: t.Union[pydantic.ValidationError, pydantic.v1.error_wrappers.ValidationError]
-) -> str:
+def parse_pydantic_error(e: pydantic.ValidationError) -> str:
     """Parse pydantic validation error."""
     message = "Invalid request data provided"
     missing = []

python/plugins/langchain/composio_langchain/toolset.py

@@ -4,7 +4,6 @@
 
 import pydantic
 import pydantic.error_wrappers
-import pydantic.v1.error_wrappers
 import typing_extensions as te
 from langchain_core.tools import StructuredTool as BaseStructuredTool
 
@@ -22,10 +21,7 @@ class StructuredTool(BaseStructuredTool):
     def run(self, *args, **kwargs):
         try:
             return super().run(*args, **kwargs)
-        except (
-            pydantic.ValidationError,
-            pydantic.v1.error_wrappers.ValidationError,
-        ) as e:
+        except pydantic.ValidationError as e:
             return {"successful": False, "error": parse_pydantic_error(e), "data": None}
 
 
@@ -64,7 +60,7 @@ class ComposioToolSet(
         tools = composio_toolset.get_tools(apps=[App.GITHUB])
 
         # Define task
-        task = "Star a repo SamparkAI/docs on GitHub"
+        task = "Star a repo composiohq/docs on GitHub"
 
         # Define agent
         agent = create_openai_functions_agent(openai_client, tools, prompt)

python/setup.py

@@ -96,7 +96,7 @@ def scan_for_package_data(
     description="Core package to act as a bridge between composio platform and other services.",
     long_description=(Path(__file__).parent / "README.md").read_text(encoding="utf-8"),
     long_description_content_type="text/markdown",
-    url="https://github.com/SamparkAI/composio_sdk",
+    url="https://github.com/composiohq/composio",
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: Apache Software License",

python/swe/setup.py

@@ -41,7 +41,7 @@ def scan_for_package_data(
     description="Tools for running a SWE agent using Composio platform",
     long_description=(Path(__file__).parent / "README.md").read_text(encoding="utf-8"),
     long_description_content_type="text/markdown",
-    url="https://github.com/SamparkAI/composio_sdk",
+    url="https://github.com/composiohq/composio",
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: Apache Software License",