Merge branch 'master' into feat/connection-id-filter

ComposioHQ · May 2, 2024 · a8ce195 · a8ce195
2 parents 5041ece + 835d526
commit a8ce195
Show file tree

Hide file tree

Showing 31 changed files with 976 additions and 386 deletions.
diff --git a/Makefile b/Makefile
@@ -56,19 +56,19 @@ build:
 
 .PHONY: publish
 publish: dist
-	twine upload dist/* && \
+	twine upload dist/* --username token --password "$$PYPI_PASSWORD" && \
 	for dir in plugins/*; do \
 		if [ -d "$$dir" ]; then \
-			twine upload "$$dir"/dist/*; \
-		fi \
+			twine upload "$$dir"/dist/* --username token --password "$$PYPI_PASSWORD"; \
+		fi; \
 	done
 
 .PHONY: test-publish
 test-publish: dist
-	twine upload --repository testpypi dist/* && \
+	twine upload --repository testpypi dist/* --username token --password "$$PYPI_PASSWORD" && \
 	for dir in plugins/*; do \
 		if [ -d "$$dir" ]; then \
-			twine upload --repository testpypi "$$dir"/dist/*; \
+			twine upload --repository testpypi "$$dir"/dist/* --username token --password "$$PYPI_PASSWORD"; \
 		fi \
 	done
 

diff --git a/Pipfile b/Pipfile
@@ -27,4 +27,6 @@ crewai = "^0.28.8"
 pyautogen = "^0.2.26"
 langchain = "^0.1.16"
 lyzr = "^0.1.5"
-
+semver = "^3.0.2"
+build = "^1.2.1"
+setuptools = "^69.5.1"
diff --git a/composio/sdk/__init__.py b/composio/sdk/__init__.py
@@ -1,11 +1,12 @@
 from .core import ComposioCore, FrameworkEnum 
 from .enums import Tag
-from .sdk import Composio, SchemaFormat
+from .sdk import Composio, SchemaFormat, format_schema
 
 __all__ = (
+    "Tag",
     "Composio",
     "ComposioCore",
-    "Tag",
+    "format_schema",
     "FrameworkEnum",
     "SchemaFormat",
     "Tag",

diff --git a/composio/sdk/core.py b/composio/sdk/core.py
@@ -22,6 +22,9 @@ class FrameworkEnum(Enum):
     AUTOGEN = "autogen"
     LANGCHAIN = "langchain"
     LYZR = "lyzr"
+    CREWAI = "crewai"
+    JULEP = "julep"
+    OPENAI = "openai"
 
 
 __IS_FIRST_TIME__ = True