Merge pull request #241 from ttt246/new-requirements

.github/workflows/brain_ci.yml

@@ -5,6 +5,7 @@ on:
   pull_request:
     paths:
       - "Brain/**"
+      - "requirements.txt"
   workflow_dispatch:
 
 env:
@@ -23,7 +24,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10.4'
+          python-version: '3.11.2'
           cache: 'pip'
       - name: Brain - Install
         run: pip install -r requirements.txt
@@ -34,4 +35,4 @@ jobs:
         with:
           # Sauce Labs Credentials.
           sauce-username: ${{ secrets.SAUCE_USERNAME }}
-          sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
+          sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}

.github/workflows/lint.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     paths:
       - "Brain/**"
+      - "requirements.txt"
   workflow_dispatch:
 
 jobs:

.gitignore

@@ -1,5 +1,9 @@
 /Brain/firebase_cred.json
-/.idea
+.idea
+.vscode
 Brain/firebase_cred.json
 Brain/logs/*
 **/.DS_Store
+**/__pycache__
+**/google-services.json
+brain.egg-info

Brain/src/rising_plugin/gmail/email_plugin.py

@@ -11,7 +11,6 @@ from email.header import decode_header
 from email.message import EmailMessage
 from socket import socket
 
-import socks
 from bs4 import BeautifulSoup
 
 from Brain.src.common.utils import PROXY_IP, PROXY_PORT
@@ -284,8 +283,6 @@ class EmailPlugin:
         self, imap_folder: str, email_sender: str, email_password: str
     ) -> imaplib.IMAP4_SSL:
         # Create a new socket object for later connections as a proxy
-        # socks.set_default_proxy(socks.SOCKS5, PROXY_IP, PROXY_PORT)
-        # socket.socket = socks.socksocket
 
         # IMAP Server Connect
         imap_server = EMAIL_IMAP_SERVER

README.md

@@ -6,7 +6,7 @@ colorTo: indigo
 app_file: app.py
 sdk: gradio
 sdk_version: 2.9.1
-python_version: 3.10.4
+python_version: 3.11.2
 pinned: false
 license: other
 ---

app.py

@@ -3,7 +3,6 @@ from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 import uvicorn
 
-# from Brain.src.gradio_debug import debug_send_notification
 from Brain.src.router.browser_router import construct_blueprint_browser_api
 from Brain.src.router.train_router import construct_blueprint_train_api
 from Brain.src.router.email_router import construct_blueprint_email_api
@@ -31,13 +30,5 @@ app.include_router(
 app.include_router(construct_blueprint_train_api(), prefix="/train", tags=["ai_train"])
 app.include_router(construct_blueprint_email_api(), prefix="/email", tags=["ai_email"])
 
-# gradio
-
-# CUSTOM_PATH = "/gradio"
-#
-# app = gr.mount_gradio_app(
-#     app, debug_send_notification, path=f"{CUSTOM_PATH}/sendNotification"
-# )
-
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=7860)

requirements.txt

@@ -1,79 +1,22 @@
-langchain >= 0.0.148
-replicate==0.8.1
-pytest==7.3.0
-async-timeout==4.0.2
-attrs==22.2.0
-beautifulsoup4==4.12.2
-black==23.3.0
-CacheControl==0.12.11
-cachetools==5.3.0
-certifi==2022.12.7
-cffi==1.15.1
-charset-normalizer==3.1.0
-click==8.1.3
-colorama==0.4.6
-cryptography==40.0.1
-dataclasses-json==0.5.7
-dill==0.3.6
-distlib==0.3.6
-dnspython==2.3.0
-exceptiongroup==1.1.1
-filelock==3.10.7
-firebase==4.0.1
-firebase-admin==6.1.0
-fastapi==0.95.0
-uvicorn==0.21.1
-frozenlist==1.3.3
-google-api-core==2.11.0
-google-api-python-client==2.90.0
-google-auth==2.17.3
-google-auth-httplib2==0.1.0
-google-cloud-core==2.3.2
-google-cloud-firestore==2.11.0
-google-cloud-storage==2.8.0
-google-crc32c==1.5.0
-google-resumable-media==2.4.1
-googleapis-common-protos==1.59.0
-gptcache==0.1.10
-greenlet==2.0.2
-grpcio==1.53.0
-grpcio-status==1.53.0
-gunicorn==20.1.0
-httplib2==0.22.0
-idna==3.4
-iniconfig==2.0.0
-isort==5.12.0
-itsdangerous==2.1.2
-Jinja2==3.1.2
-lazy-object-proxy==1.9.0
-loguru==0.7.0
-MarkupSafe==2.1.2
-marshmallow==3.19.0
-marshmallow-enum==1.5.1
-mccabe==0.7.0
-msgpack==1.0.5
-multidict==6.0.4
-mypy-extensions==1.0.0
-numexpr==2.8.4
-numpy==1.24.2
-openai==0.27.4
-openapi-schema-pydantic>=1.2.4
-packaging==23.1
-pathspec==0.11.1
-pinecone-client==2.2.1
-platformdirs==3.2.0
-pluggy==1.0.0
-proto-plus==1.22.2
-win32-setctime==1.1.0
-wrapt==1.15.0
-yarl==1.8.2
-twilio==8.2.1
-nemoguardrails==0.2.0
-user-agents==2.2.0
-faiss-cpu==1.7.4
-google-search-results==2.4.2
-tiktoken==0.4.0
-tiktoken==0.4.0
-gradio-client==0.2.7
-gradio==3.14.0
-PySocks==1.7.1
+bs4
+colorama
+gradio
+faiss-cpu
+fastapi
+firebase
+firebase-admin
+langchain
+marshmallow
+nemoguardrails
+openai
+pinecone-client
+replicate
+socks
+twilio
+user_agents
+uvicorn
+
+black
+pytest
+pytest-cov
+pytest-xdist

runtime.txt

@@ -1 +1 @@
-python-3.10.9
+python-3.11.2