api/handler.py

@@ -41,8 +41,6 @@ async def handle(incoming_request: fastapi.Request):
         payload = await incoming_request.json()
     except json.decoder.JSONDecodeError:
         payload = {}
-    except UnicodeDecodeError:
-        payload = {}
 
     received_key = incoming_request.headers.get('Authorization')
 
@@ -85,31 +83,29 @@ async def handle(incoming_request: fastapi.Request):
     if user['credits'] < cost:
         return await errors.error(429, 'Not enough credits.', 'Wait or earn more credits. Learn more on our website or Discord server.')
 
+    payload_with_vars = json.dumps(payload)
 
-    if not 'DISABLE_VARS' in key_tags:
-        payload_with_vars = json.dumps(payload)
+    replace_dict = {
+        'timestamp': str(int(time.time())),
+        'date': time.strftime('%Y-%m-%d'),
+        'time': time.strftime('%H:%M:%S'),
+        'datetime': time.strftime('%Y-%m-%d %H:%M:%S'),
+        'model': payload.get('model', 'unknown'),
+    }
 
-        replace_dict = {
-            'timestamp': str(int(time.time())),
-            'date': time.strftime('%Y-%m-%d'),
-            'time': time.strftime('%H:%M:%S'),
-            'datetime': time.strftime('%Y-%m-%d %H:%M:%S'),
-            'model': payload.get('model', 'unknown'),
-        }
+    if 'ALLOW_INSECURE_VARS' in key_tags:
+        replace_dict.update({
+            'my.ip': ip_address,
+            'my.id': str(user['_id']),
+            'my.role': user.get('role', 'default'),
+            'my.credits': str(user['credits']),
+            'my.discord': user.get('auth', {}).get('discord', ''),
+        })
 
-        if 'ALLOW_INSECURE_VARS' in key_tags:
-            replace_dict.update({
-                'my.ip': ip_address,
-                'my.id': str(user['_id']),
-                'my.role': user.get('role', 'default'),
-                'my.credits': str(user['credits']),
-                'my.discord': user.get('auth', {}).get('discord', ''),
-            })
+    for key, value in replace_dict.items():
+        payload_with_vars = payload_with_vars.replace(f'[[{key}]]', value)
 
-        for key, value in replace_dict.items():
-            payload_with_vars = payload_with_vars.replace(f'[[{key}]]', value)
-
-        payload = json.loads(payload_with_vars)
+    payload = json.loads(payload_with_vars)
 
     policy_violation = False
     if '/moderations' not in path:

api/helpers/network.py

@@ -1,9 +1,4 @@
-import os
-import time
-
-from dotenv import load_dotenv
-
-load_dotenv()
+import asyncio
 
 async def get_ip(request) -> str:
     """Get the IP address of the incoming request."""
@@ -22,7 +17,7 @@ async def get_ip(request) -> str:
 
     return detected_ip
 
-def get_ratelimit_key(request) -> str:
+def get_ip_sync(request) -> str:
     """Get the IP address of the incoming request."""
 
     xff = None
@@ -37,9 +32,4 @@ def get_ratelimit_key(request) -> str:
 
     detected_ip = next((i for i in possible_ips if i), None)
 
-    for whitelisted_ip in os.getenv('NO_RATELIMIT_IPS', '').split():
-        if whitelisted_ip in detected_ip:
-            custom_key = f'whitelisted-{time.time()}'
-            return custom_key
-
     return detected_ip

api/main.py

@@ -32,7 +32,7 @@ app.include_router(core.router)
 
 limiter = Limiter(
     swallow_errors=True,
-    key_func=network.get_ratelimit_key, default_limits=[
+    key_func=network.get_ip_sync, default_limits=[
     '2/second',
     '20/minute',
     '300/hour'

api/moderation.py

@@ -3,7 +3,6 @@
 import time
 import asyncio
 import aiohttp
-import profanity_check
 
 import proxies
 import provider_auth
@@ -11,8 +10,14 @@ import load_balancing
 
 from typing import Union
 
-def input_to_text(inp: Union[str, list]) -> str:
-    """Converts the input to a string."""
+async def is_policy_violated(inp: Union[str, list]) -> bool:
+    """
+    ### Check if a message violates the moderation policy.
+    You can either pass a list of messages consisting of dicts with "role" and "content", as used in the API parameter,
+    or just a simple string.
+    
+    Returns True if the message violates the policy, False otherwise.
+    """
 
     text = inp
 
@@ -25,21 +30,7 @@ def input_to_text(inp: Union[str, list]) -> str:
         else:
             text = '\n'.join(inp)
 
-    return text
-
-async def is_policy_violated(inp: Union[str, list]) -> bool:
-    """
-    ### Check if a message violates the moderation policy.
-    You can either pass a list of messages consisting of dicts with "role" and "content", as used in the API parameter,
-    or just a simple string.
-    
-    Returns True if the message violates the policy, False otherwise.
-    """
-
-    text = input_to_text(inp)
-    return await is_policy_violated__own_model(text)
-
-    for _ in range(1):
+    for _ in range(5):
         req = await load_balancing.balance_organic_request(
             {
                 'path': '/v1/moderations',
@@ -70,18 +61,11 @@ async def is_policy_violated(inp: Union[str, list]) -> bool:
                     return False
 
             except Exception as exc:
+
                 if '401' in str(exc):
                     await provider_auth.invalidate_key(req.get('provider_auth'))
                 print('[!] moderation error:', type(exc), exc)
                 continue
 
-async def is_policy_violated__own_model(inp: Union[str, list]) -> bool:
-    inp = input_to_text(inp)
-
-    if profanity_check.predict([inp])[0]:
-        return 'own model detected'
-
-    return False
-
 if __name__ == '__main__':
-    print(asyncio.run(is_policy_violated('kill ms')))
+    print(asyncio.run(is_policy_violated('I wanna kill myself')))

api/streaming.py

@@ -177,7 +177,5 @@ async def stream(
         model=model,
     )
 
-    print(f'[+] {path} -> {model or ""}')
-
 if __name__ == '__main__':
     asyncio.run(stream())

screen.sh

@@ -3,20 +3,17 @@
 # Commit to the production branch
 # git commit -am "Auto-trigger - Production server started" && git push origin Production
 
-# Kill production server
-fuser -k 2333/tcp
-
-# Clear production directory
-rm -rf /home/nova-prod/*
-
 # Copy files to production
 cp -r * /home/nova-prod
 
-# Copy .prod.env file to production
+# Copy env file to production
 cp env/.prod.env /home/nova-prod/.env
 
 # Change directory
 cd /home/nova-prod
 
+# Kill the production server
+fuser -k 2333/tcp
+
 # Start screen
 screen -S nova-api python run prod && sleep 5

setup.md

@@ -23,17 +23,6 @@ or
 pip install .
 ```
 
-***
-
-Profanity checking requires:
-
-```
-pip install alt-profanity-check
-# doesn't work? try
-pip install git+https://github.com/dimitrismistriotis/alt-profanity-check.git
-```
-
-
 ## `.env` configuration
 Create a `.env` file, make sure not to reveal any of its contents to anyone, and fill in the required values in the format `KEY=VALUE`. Otherwise, the code won't run.