diff --git a/setup.py b/setup.py index fd3aaf9e..746918a9 100644 --- a/setup.py +++ b/setup.py @@ -1,21 +1,21 @@ from setuptools import setup, find_packages -from setuptools.command.install import install +# from setuptools.command.install import install -class PostInstallCommand(install): - """Post-installation for installation mode.""" - def run(self): - install.run(self) - # PUT YOUR POST-INSTALL SCRIPT HERE or CALL A FUNCTION - import subprocess - subprocess.check_call(["pip", "install", "git+https://github.com/IDEA-Research/GroundingDINO.git"]) - subprocess.check_call(["pip", "install", "git+https://github.com/facebookresearch/segment-anything.git"]) +# class PostInstallCommand(install): +# """Post-installation for installation mode.""" +# def run(self): +# install.run(self) +# # PUT YOUR POST-INSTALL SCRIPT HERE or CALL A FUNCTION +# import subprocess +# subprocess.check_call(["pip", "install", "git+https://github.com/IDEA-Research/GroundingDINO.git"]) +# subprocess.check_call(["pip", "install", "git+https://github.com/facebookresearch/segment-anything.git"]) setup( name = 'swarms', packages = find_packages(exclude=[]), - version = '0.2.7', + version = '0.2.8', license='MIT', description = 'Swarms - Pytorch', author = 'Kye Gomez', @@ -80,9 +80,6 @@ setup( "pytube", "pydub" ], - cmdclass={ - 'install': PostInstallCommand, - }, classifiers=[ 'Development Status :: 4 - Beta', 'Intended Audience :: Developers', diff --git a/swarms/agents/workers/models/GroundingDINO b/swarms/agents/workers/models/GroundingDINO new file mode 160000 index 00000000..6c27bc76 --- /dev/null +++ b/swarms/agents/workers/models/GroundingDINO @@ -0,0 +1 @@ +Subproject commit 6c27bc76b9c7252c201e0b8c680d7349a7a0aaf8 diff --git a/swarms/agents/workers/models/segment_anything b/swarms/agents/workers/models/segment_anything new file mode 160000 index 00000000..6fdee8f2 --- /dev/null +++ b/swarms/agents/workers/models/segment_anything @@ -0,0 +1 @@ +Subproject commit 6fdee8f2727f4506cfbbe553e23b895e27956588 diff --git a/swarms/agents/workers/multi_modal.py b/swarms/agents/workers/multi_modal.py index 73d251d3..0c60f4d3 100644 --- a/swarms/agents/workers/multi_modal.py +++ b/swarms/agents/workers/multi_modal.py @@ -32,14 +32,14 @@ from langchain.chains.conversation.memory import ConversationBufferMemory from langchain.llms.openai import OpenAI # Grounding DINO -import groundingdino.datasets.transforms as T -from groundingdino.models import build_model -from groundingdino.util import box_ops -from groundingdino.util.slconfig import SLConfig -from groundingdino.util.utils import clean_state_dict, get_phrases_from_posmap - -# segment anything # -from segment_anything import build_sam, SamPredictor, SamAutomaticMaskGenerator +# import groundingdino.datasets.transforms as T +import models.GroundingDINO.groundingdino.datasets.transforms as T +from models.GroundingDINO.groundingdino.models import build_model +from models.GroundingDINO.groundingdino.util import box_ops +from models.GroundingDINO.groundingdino.util.slconfig import SLConfig +from models.GroundingDINO.groundingdino.util.utils import clean_state_dict, get_phrases_from_posmap + +from models.segment_anything.segment_anything import build_sam, SamPredictor, SamAutomaticMaskGenerator import cv2 import numpy as np import matplotlib.pyplot as plt