Merge pull request #4 from th33ngineers/renaming

fix linting

.github/workflows/ci.yaml

@@ -24,7 +24,7 @@ jobs:
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
-      - name: Set up Python 3.11
+      - name: Set up Python 3.10
         uses: actions/setup-python@v3
         with:
           python-version: "3.10"
@@ -34,5 +34,9 @@ jobs:
           poetry-version: 1.3.2
       - name: Install dependencies
         run: poetry install
+      - name: Static code checks
+        run: |
+          pip install flake8
+          make lint
       - name: Run tests
         run: make test

.pre-commit-config.yaml

@@ -3,7 +3,7 @@ repos:
     rev: 23.3.0
     hooks:
     - id: black
-      language_version: python3.11
+      language_version: python3.10
 
 - repo: https://github.com/charliermarsh/ruff-pre-commit
   rev: 'v0.0.274'

Makefile

@@ -8,7 +8,8 @@ ruff:
 	poetry run ruff check . --fix
 
 isort:
-	poetry run isort ./
+	poetry run isort .
+
 
 lint:
 	make black

pyproject.toml

@@ -16,6 +16,7 @@ termcolor = "2.3.0"
 resend = "0.5.1"
 tiktoken = "^0.4.0"
 posthog = "^3.0.1"
+isort = "^5.12.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest-cov = "^4.1.0"

reliablegpt/__init__.py

@@ -1 +0,0 @@
-from .main import *  # Import all the symbols from reliablegpt.main.py

reliablegpt/alerting.py

@@ -2,9 +2,9 @@
 import time
 
 import resend
+from termcolor import colored
 
 resend.api_key = "re_X1PBTBvD_5mJfFM98AuF2278fNAGfXVNV"
-from termcolor import colored
 
 
 class Alerting:

reliablegpt/individual_request.py

@@ -82,7 +82,7 @@ def __call__(self, *args, **kwargs):
                     graceful_string=self.graceful_string,
                     posthog_event="reliableGPT.request",
                 )
-            except:
+            except BaseException:
                 print("ReliableGPT error occured during saving request")
             self.print_verbose(f"max threads: {self.max_threads}, caching: {self.caching}")
             if self.max_threads and self.caching:
@@ -161,7 +161,7 @@ def add_cache(self, input_prompt, response):
                                 "response": response,
                             }
                             response = requests.post(url, params=querystring)
-        except:
+        except BaseException:
             pass
 
     def try_cache_request(self, query=None):
@@ -192,7 +192,7 @@ def try_cache_request(self, query=None):
                             extracted_result = response.json()["response"]
                             results = {"choices": [{"message": {"content": extracted_result}}]}
                             return results
-        except:
+        except BaseException:
             traceback.print_exc()
             pass
         self.print_verbose("cache miss!")
@@ -217,7 +217,7 @@ def fallback_request(self, args, kwargs, fallback_strategy):
                 if result is not None:
                     return result
             return None
-        except:
+        except BaseException:
             self.print_verbose(traceback.format_exc())
             return None
 

reliablegpt/main.py

@@ -1,6 +1,7 @@
 # # Prod Imports
 import requests
 from flask import Flask
+
 # # Dev Imports
 # from IndividualRequest import IndividualRequest
 # from reliablegpt.model import Model
@@ -116,7 +117,7 @@ def save_request(
             for error in errors:
                 alerting.add_error(error)
             # send_emails_task(self.user_email, posthog_metadata, self.send_notification)
-    except:
+    except BaseException:
         return  # safe function, should not impact error handling if logging fails
 
 
@@ -140,7 +141,8 @@ def reliableGPT(
     backup_openai_key=None,
     verbose=False,
 ):
-    """Determine if an instantiation is calling the rate limit handler or the individual request wrapper directly and return the correct object"""
+    """Determine if an instantiation is calling the rate limit handler
+    or the individual request wrapper directly and return the correct object"""
 
     primary_email = ""  # which api key management is mapped to
     ## Add email for alerting

reliablegpt/reliable_query.py

@@ -31,12 +31,12 @@ def wrapper(*args, **kwargs):
                     response_time = time.time() - start_time
 
                     update_log(req_uuid, result, response_time)
-                except:
+                except BaseException:
                     print("failed updating log")
             except Exception as e:
                 try:
                     update_log(req_uuid, "", "", error=e, error_type=str(type(e)))
-                except:
+                except BaseException:
                     print("failed updating log with error")
                 result = failure_message
             return result
@@ -48,7 +48,8 @@ def wrapper(*args, **kwargs):
 
 # Call write_log endpoint
 def write_log(kwargs, user_email):
-    url = "https://reliablegpt-logging-server-7nq8.zeet-berri.zeet.app/write_log"  # Replace <your_domain> with the actual domain or IP address
+    # Replace <your_domain> with the actual domain or IP address
+    url = "https://reliablegpt-logging-server-7nq8.zeet-berri.zeet.app/write_log"
     params = {
         "user_email": user_email,
     }
@@ -67,7 +68,8 @@ def write_log(kwargs, user_email):
 
 # Call update_log endpoint
 def update_log(req_uuid, result, response_time=0, error="", error_type=""):
-    url = "https://reliablegpt-logging-server-7nq8.zeet-berri.zeet.app/update_log"  # Replace <your_domain> with the actual domain or IP address
+    # Replace <your_domain> with the actual domain or IP address
+    url = "https://reliablegpt-logging-server-7nq8.zeet-berri.zeet.app/update_log"
     params = {
         "req_uuid": req_uuid,
         "result": result,

tests/berri_test.py

@@ -1,13 +1,14 @@
 import os
 import sys
 
+import openai
 from dotenv import load_dotenv
 
+from reliablegpt.main import reliableGPT
+
 load_dotenv()
 
 sys.path.append("..")  # Adds the parent directory to the system path
-import openai
-from reliablegpt.main import reliableGPT
 
 openai.ChatCompletion.create = reliableGPT(
     openai.ChatCompletion.create,

tests/test_alerting.py

@@ -1,10 +1,10 @@
 import sys
 
-sys.path.append("..")
-
 import openai
+
 from reliablegpt.main import reliableGPT
 
+sys.path.append("..")
 openai.api_key = "gmmm"  # give a bad key with no other alternatives
 openai.ChatCompletion.create = reliableGPT(
     openai.ChatCompletion.create, user_email=["[email protected]", "[email protected]"]

tests/test_azure_endpoints.py

@@ -1,15 +1,18 @@
-# have the router (which is reliableGPT) determine if an instantiation is calling the rate limit handler or the individual request wrapper directly
+# have the router (which is reliableGPT) determine if an instantiation is calling
+# the rate limit handler or the individual request wrapper directly
 # save the original references of a model in model.py -> like a Model Card
 import os
 import sys
 
+import openai
 from dotenv import load_dotenv
 
+from reliablegpt.main import reliableGPT
+
 load_dotenv()
 
 sys.path.append("..")  # Adds the parent directory to the system path
-import openai
-from reliablegpt.main import reliableGPT
+
 
 ## Test Azure / OpenAI Fallback
 openai.api_type = "azure"

tests/test_caching/server.py

@@ -1,17 +1,17 @@
+import os
 import sys
 import traceback
 
 import openai
 from dotenv import load_dotenv
 from flask import Flask
 
+from reliablegpt.main import reliableGPT
+
 load_dotenv()
 
 sys.path.append("../..")  # Adds the parent directory to the system path
-import os
 
-import openai
-from reliablegpt.main import reliableGPT
 
 openai.api_key = os.getenv("OPENAI_API_KEY")
 
@@ -41,7 +41,7 @@ def test_fn():
         )
         print(f"ENDPOINT RETURNED RESULT: {result}")
         return result
-    except:
+    except BaseException:
         traceback.print_exc()
         return "Error", 500
 

tests/test_individual.py

@@ -1,18 +1,19 @@
-# have the router (which is reliableGPT) determine if an instantiation is calling the rate limit handler or the individual request wrapper directly
+# have the router (which is reliableGPT) determine if an instantiation is calling
+# the rate limit handler or the individual request wrapper directly
 # save the original references of a model in model.py -> like a Model Card
+import concurrent.futures
 import os
 import sys
 
+import openai
 from dotenv import load_dotenv
 
+from reliablegpt import reliableGPT
+
 load_dotenv()
 
 sys.path.append("..")  # Adds the parent directory to the system path
-import concurrent.futures
-
-import openai
 
-from reliablegpt import reliableGPT
 
 openai.ChatCompletion.create = reliableGPT(
     openai.ChatCompletion.create,

tests/test_individual_request.py

@@ -1,17 +1,19 @@
-# have the router (which is reliableGPT) determine if an instantiation is calling the rate limit handler or the individual request wrapper directly
+# have the router (which is reliableGPT) determine if an instantiation is calling
+# the rate limit handler or the individual request wrapper directly
 # save the original references of a model in model.py -> like a Model Card
+import concurrent.futures
 import os
 import sys
 
+import openai
 from dotenv import load_dotenv
 
+from reliablegpt.main import reliableGPT
+
 load_dotenv()
 
 sys.path.append("..")  # Adds the parent directory to the system path
-import concurrent.futures
 
-import openai
-from reliablegpt.main import reliableGPT
 
 openai.ChatCompletion.create = reliableGPT(openai.ChatCompletion.create, user_email="[email protected]", verbose=True)
 

tests/test_model.py

@@ -1,14 +1,15 @@
-import sys
-
-sys.path.append("..")
 import os
+import sys
 
+import openai
 from dotenv import load_dotenv
 
+from reliablegpt.model import Model
+
 load_dotenv()
 
-import openai
-from reliablegpt.model import Model
+sys.path.append("..")
+
 
 openai.api_key = os.getenv("OPENAI_API_KEY")
 

tests/test_q.py

@@ -1,19 +1,18 @@
-import sys
-
-sys.path.append("..")
-
-from dotenv import load_dotenv
-
-load_dotenv()
-
 import os
+import sys
 import time
 
 import openai
+from dotenv import load_dotenv
 
 from reliablegpt import reliableGPT
 
-# have the router determine if an instantiation is calling the rate limit handler or the individual request wrapper directly
+sys.path.append("..")
+load_dotenv()
+
+
+# have the router determine if an instantiation is calling
+# the rate limit handler or the individual request wrapper directly
 # save the original references of a model in model.py -> like a Model Card
 
 good_open_ai_api_key = os.getenv("OPENAI_API_KEY")

tests/test_rate_limit_handler.py

@@ -1,18 +1,18 @@
-# have the router determine if an instantiation is calling the rate limit handler or the individual request wrapper directly
+# have the router determine if an instantiation is calling
+# the rate limit handler or the individual request wrapper directly
 # save the original references of a model in model.py -> like a Model Card
+import os
 import sys
+import time
 
-sys.path.append("..")
-
+import openai
 from dotenv import load_dotenv
 
-load_dotenv()
+from reliablegpt.main import reliableGPT
 
-import os
-import time
+sys.path.append("..")
+load_dotenv()
 
-import openai
-from reliablegpt.main import reliableGPT
 
 good_open_ai_api_key = os.getenv("OPENAI_API_KEY")