Fixed conflicts

Querent-ai · Apr 25, 2024 · e938505 · e938505
2 parents 564cb61 + ce4607c
commit e938505
Show file tree

Hide file tree

Showing 2 changed files with 80 additions and 82 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,12 +1,21 @@
-cachetools==5.3.3
+aiofiles==23.2.1
 aiohttp==3.9.3
 attrs==23.1.0
+azure-storage-blob==12.19.0
 beautifulsoup4==4.12.3
 boto3==1.26.146
 botocore==1.29.146
 bs4==0.0.1
+cachetools==5.3.3
+coverage==7.3.3
+dropbox==11.36.2
 faiss-cpu==1.7.4
+ffmpeg-python==0.2.0
 gensim==4.3.2
+google-api-python-client==2.105.0
+google-cloud-storage==2.14.0
+google-cloud-storage==2.14.0
+google-cloud-storage==2.14.0
 hdbscan==0.8.33
 jira==3.6.0
 jmespath==1.0.1
@@ -19,55 +28,47 @@ langchain==0.1.11
 langchain-community==0.0.25
 llama_cpp_python==0.2.15
 lxml==4.9.2
+moviepy==1.0.3
 newspaper3k==0.2.8
+newsapi-python==0.2.7
 nltk==3.8.1
 numpy==1.24.3
-Pillow==10.3.0
+openai==1.13.3
+openpyxl==3.1.2
+pandas==2.1.4
+pdfminer==20191125
+pillow==10.3.0
+prometheus-client==0.17.1
+psutil==5.9.8
+pybase64==1.3.1
 pydantic==2.6.4
-PyJWT==2.4.0
-pytest==7.3.2
-python-dotenv==1.0.0
-redis==5.0.3
-regex==2023.5.5
-sentence-transformers==2.2.2
-spacy==3.7.2
-uvicorn==0.29.0
-slack-sdk==3.26.1
+pydub==0.25.1
+pyjwt==2.4.0
 pylint==2.17.4
-pytest-cov==4.1.0
-pytest-mock==3.11.1
-tensorflow==2.14.0
-transformers==4.36.0
-torch==2.0.1 --index-url https://download.pytorch.org/whl/cpu
 pymupdf==1.24.0
-asyncio==3.4.3
-prometheus-client==0.17.1
-rdflib==7.0.0
 pyshacl==0.25.0
-aiofiles==23.2.1
-pytest-asyncio==0.23.2
-google-cloud-storage==2.14.0
-pydub==0.25.1
-SpeechRecognition==3.10.1
 pytesseract==0.3.10
 pytextract==2.0.1
-pandas==2.1.4
-python-pptx==0.6.23
-tika==2.6.0
-openpyxl==3.1.2
-coverage==7.3.3
-azure-storage-blob==12.19.0
-moviepy==1.0.3
+python-dotenv==1.0.0
 python-docx==1.1.0
-psutil==5.9.8
-dropbox==11.36.2
+python-pptx==0.6.23
+rdflib==7.0.0
+redis==5.0.3
+regex==2023.5.5
 requests==2.31.0
-google-api-python-client==2.105.0
-pybase64==1.3.1
-pdfminer==20191125
 requests_html==0.10.0
+slack-sdk==3.26.1
+slack-sdk==3.26.1
+spacy==3.7.2
+speechrecognition==3.10.1
+tika==2.6.0
+transformers==4.36.0
 unidecode==1.3.7
-openai==1.13.3
-newsapi-python==0.2.7
-ffmpeg-python==0.2.0
-pdfplumber==0.10.0
+pdfplumber==0.10.0
+sentence-transformers==2.2.2
+
+# Testing
+pytest==7.3.2
+pytest-asyncio==0.23.2
+pytest-cov==4.1.0
+pytest-mock==3.11.1
diff --git a/setup.py b/setup.py
@@ -5,15 +5,24 @@
 from setuptools import setup, find_packages
 
 requirements = [
-    "cachetools==5.3.3",
+    "aiofiles==23.2.1",
     "aiohttp==3.9.3",
     "attrs==23.1.0",
+    "azure-storage-blob==12.19.0",
     "beautifulsoup4==4.12.3",
     "boto3==1.26.146",
     "botocore==1.29.146",
     "bs4==0.0.1",
+    "cachetools==5.3.3",
+    "coverage==7.3.3",
+    "dropbox==11.36.2",
     "faiss-cpu==1.7.4",
+    "ffmpeg-python==0.2.0",
     "gensim==4.3.2",
+    "google-api-python-client==2.105.0",
+    "google-cloud-storage==2.14.0",
+    "google-cloud-storage==2.14.0",
+    "google-cloud-storage==2.14.0",
     "hdbscan==0.8.33",
     "jira==3.6.0",
     "jmespath==1.0.1",
@@ -22,69 +31,57 @@
     "jsonmerge==1.9.0",
     "jsonschema==4.17.3",
     "kombu==5.2.4",
+    "langchain==0.1.11",
+    "langchain-community==0.0.25",
     "llama_cpp_python==0.2.15",
     "lxml==4.9.2",
+    "moviepy==1.0.3",
     "newspaper3k==0.2.8",
+    "newsapi-python==0.2.7",
     "nltk==3.8.1",
     "numpy==1.24.3",
-    "Pillow==10.3.0",
+    "openai==1.13.3",
+    "openpyxl==3.1.2",
+    "pandas==2.1.4",
+    "pdfminer==20191125",
+    "pillow==10.3.0",
+    "prometheus-client==0.17.1",
+    "psutil==5.9.8",
+    "pybase64==1.3.1",
     "pydantic==2.6.4",
-    "PyJWT==2.4.0",
-    "pytest==7.3.2",
-    "python-dotenv==1.0.0",
-    "redis==5.0.3",
-    "regex==2023.5.5",
-    "sentence-transformers==2.2.2",
-    "spacy==3.7.2",
-    "uvicorn==0.29.0",
-    "slack-sdk==3.26.1",
+    "pydub==0.25.1",
+    "pyjwt==2.4.0",
     "pylint==2.17.4",
-    "pytest-cov==4.1.0",
-    "pytest-mock==3.11.1",
-    "tensorflow==2.14.0",
-    "transformers==4.36.0",
-    "asyncio==3.4.3",
-    "aiofiles==23.2.1",
-    "prometheus-client==0.17.1",
-    "rdflib==7.0.0",
-    "pytest-asyncio==0.23.2",
+    "pymupdf==1.24.0",
     "pyshacl==0.25.0",
-    "google-cloud-storage==2.14.0",
-    "PyMuPDF==1.24.0",
-    "pydub==0.25.1",
-    "SpeechRecognition==3.10.1",
     "pytesseract==0.3.10",
     "pytextract==2.0.1",
-    "pandas==2.1.4",
-    "python-pptx==0.6.23",
-    "tika==2.6.0",
-    "openpyxl==3.1.2",
-    "coverage==7.3.3",
-    "azure-storage-blob==12.19.0",
-    "moviepy==1.0.3",
+    "python-dotenv==1.0.0",
     "python-docx==1.1.0",
-    "dropbox==11.36.2",
+    "python-pptx==0.6.23",
+    "rdflib==7.0.0",
+    "redis==5.0.3",
+    "regex==2023.5.5",
     "requests==2.31.0",
-    "google-api-python-client==2.105.0",
     "requests_html==0.10.0",
-    "pybase64==1.3.1",
-    "pdfminer==20191125",
+    "slack-sdk==3.26.1",
+    "slack-sdk==3.26.1",
+    "spacy==3.7.2",
+    "speechrecognition==3.10.1",
+    "tika==2.6.0",
+    "transformers==4.36.0",
     "unidecode==1.3.7",
-    "psutil==5.9.8",
-    "langchain-community==0.0.25",
-    "langchain==0.1.11",
-    "openai==1.13.3",
-    "newsapi-python==0.2.7",
-    "ffmpeg-python==0.2.0",
     "pdfplumber==0.10.0"
+    "sentence-transformers==2.2.2",
 ]
 
+
 with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
 
 setup(
     name="querent",
-    version="3.0.3",
+    version="3.0.4",
     author="Querent AI",
     description="The Asynchronous Data Dynamo and Graph Neural Network Catalyst",
     long_description=long_description,