Merge branch 'NovaOSS:main' into main

.github/workflows/tests.yml

@@ -1,12 +1,14 @@
 name: Python Tests
 
-on: [pull_request]
+on:
+  pull_request_target:
+    types: [review_requested]
 
 jobs:
   test:
     runs-on: ubuntu-latest
     env:
-      MONGO_URI: justtotes
+      MONGO_URI:  ${{ secrets.MONGO_URI }}
       NOVA_KEY: ${{ secrets.NOVA_KEY }}
       
     steps:
@@ -16,7 +18,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: 3.10
+        python-version: 3.x
         
     - name: Install dependencies
       run: |
@@ -24,9 +26,7 @@ jobs:
         pip install -r requirements.txt
         pip install uvicorn
     
-    - name: Start API server
+    - name: Start API server & run tests!
       run: |
         python run
     
-    - name: Run tests
-      run: python tests

README.md

@@ -1,5 +1,5 @@
-# ☄️ NovaOSS API Server
+# ☄️ NovaAI - Core API Server
-Reverse proxy server for "Closed"AI's API.
+API server for accessing AI models.
 
 ![Badge showing the most used language](https://img.shields.io/github/languages/top/novaoss/nova-api)
 ![Badge showing the code size](https://img.shields.io/github/languages/code-size/novaoss/nova-api)
@@ -14,11 +14,7 @@ Reverse proxy server for "Closed"AI's API.
 
 ![Nova-API Conver/Banner Image - a picture of a galaxy with the caption "the core API server"](https://i.ibb.co/ZBhkS56/nova-api.png)
 
-> "*OpenAI is very closed*"
+We aim to fix that! NovaAI provides several AI models for you to use for free.
-> 
-> — [ArsTechnica (July 2023)](https://arstechnica.com/information-technology/2023/07/is-chatgpt-getting-worse-over-time-study-claims-yes-but-others-arent-sure/)
-
-We aim to fix that!
 
 ## Star History
 

api/db/users.py

@@ -47,7 +47,7 @@ class UserManager:
     async def create(self, discord_id: str = '') -> dict:
         chars = string.ascii_letters + string.digits
 
-        infix = os.getenv('KEYGEN_INFIX')
+        infix = os.getenv('KEYGEN_INFIX', 'S3LFH0ST')
         suffix = ''.join(random.choices(chars, k=20))
         prefix = ''.join(random.choices(chars, k=20))
 

api/main.py

@@ -26,7 +26,7 @@ app.include_router(core.router)
 async def startup_event():
     # DATABASE FIX https://stackoverflow.com/questions/65970988/python-mongodb-motor-objectid-object-is-not-iterable-error-while-trying-to-f
     import pydantic, bson
-    pydantic.json.ENCODERS_BY_TYPE[bson.objectid.ObjectId]=str
+    # pydantic.json.ENCODERS_BY_TYPE[bson.objectid.ObjectId]=str
 
 @app.get('/')
 async def root():

run/__main__.py

@@ -14,6 +14,7 @@ Runs for production on the speicified port.
 
 import os
 import sys
+import time
 
 port = sys.argv[1] if len(sys.argv) > 1 else 2332
 dev = True
@@ -22,4 +23,4 @@ if 'prod' in sys.argv:
     port = 2333
     dev = False
 
-os.system(f'cd api && uvicorn main:app{" --reload" if dev else ""} --host 0.0.0.0 --port {port}')
+os.system(f'cd api && uvicorn main:app{" --reload" if dev else ""} --host 0.0.0.0 --port {port} & python tests')

tests/__main__.py

@@ -3,6 +3,7 @@
 import os
 import openai as closedai
 import httpx
+import time
 
 from rich import print
 from typing import List
@@ -91,12 +92,15 @@ def test_api_moderation() -> dict:
 
 def test_all():
     """Runs all tests."""
+    try:
+        print("Waiting until API Server is started up...")
+        time.sleep(6)
 
         print('[lightblue]Running test on API server to check if its running...')
         print(test_server())
 
         print('[lightblue]Running a api endpoint to see if requests can go through...')
-    print(test_api())
+        print(test_api('gpt-3.5-trubo'))
 
         print('[lightblue]Checking if the API works with the python library...')
         print(test_library())
@@ -106,6 +110,10 @@ def test_all():
 
         print('[lightblue]Checking the /v1/models endpoint...')
         print(test_models())
+    except Exception as e:
+        print('[red]Error: ')
+        print(e)
+        exit(500)
 
 if __name__ == '__main__':
     closedai.api_base = api_endpoint