Merge pull request #387 from Haidra-Org/mr

fix: Show shared key names

.env_template

@@ -7,6 +7,9 @@ HORDE_LOGO="https://raw.githubusercontent.com/db0/Stable-Horde/main/img_stable/0
 HORDE_HTML_TERMS="terms_of_service.html"
 HORDE_HTML_PRIVACY="privacy_policy.html"
 HORDE_MARKDOWN_INDEX="index_stable.md"
+HORDE_IMAGE_COMPVIS_REFERENCE="https://raw.githubusercontent.com/Haidra-Org/AI-Horde-image-model-reference/main/stable_diffusion.json"
+HORDE_IMAGE_DIFFUSERS_REFERENCE="https://raw.githubusercontent.com/Haidra-Org/AI-Horde-image-model-reference/main/diffusers.json"
+HORDE_IMAGE_LLM_REFERENCE="https://raw.githubusercontent.com/db0/AI-Horde-text-model-reference/main/db.json"
 # Google Oauth2
 GOOGLE_CLIENT_ID=""
 GLOOGLE_CLIENT_SECRET=""

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+# 4.32.3
+
+* Shared Keys details now include their name
+* Allow customizing horde model reference locations
+
 # 4.32.2
 
 * Adds support for customizing the Horde (name/icons/frontpage etc)

horde/__init__.py

@@ -19,9 +19,9 @@
 def after_request(response):
     response.headers["Access-Control-Allow-Origin"] = "*"
     response.headers["Access-Control-Allow-Methods"] = "POST, GET, OPTIONS, PUT, DELETE, PATCH"
-    response.headers[
-        "Access-Control-Allow-Headers"
-    ] = "Accept, Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, apikey, Client-Agent, X-Fields"
+    response.headers["Access-Control-Allow-Headers"] = (
+        "Accept, Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, apikey, Client-Agent, X-Fields"
+    )
     response.headers["Horde-Node"] = f"{socket.gethostname()}:{args.port}:{HORDE_VERSION}"
     return response
 

horde/apis/models/v2.py

@@ -751,6 +751,7 @@ def __init__(self, api):
                 "username": fields.String(
                     description="The owning user's unique Username. It is a combination of their chosen alias plus their ID.",
                 ),
+                "name": fields.String(description="The Shared Key Name."),
                 "kudos": fields.Integer(description="The Kudos limit assigned to this key."),
                 "expiry": fields.DateTime(
                     dt_format="rfc822",

horde/apis/v2/base.py

@@ -394,9 +394,7 @@ def post(self):
         # self.priority_users = [self.user]
         ## Start prioritize by bridge request ##
         pre_priority_user_ids = [x.split("#")[-1] for x in self.priority_usernames]
-        if any(
-            (u == '' or not u.isdigit) for u in pre_priority_user_ids
-        ):
+        if any((u == "" or not u.isdigit) for u in pre_priority_user_ids):
             raise e.BadRequest(
                 message="Priority usernames need to be provided in the form of 'alias#number'. Example: 'db0#1'",
                 rc="InvalidPriorityUsername",
@@ -2731,7 +2729,7 @@ class SharedKeySingle(Resource):
     @api.response(401, "Invalid API Key", models.response_model_error)
     @api.response(404, "Shared Key Not Found", models.response_model_error)
     def get(self, sharedkey_id=""):
-        """Get details about an existing Shared Key for this user"""
+        """Get details about an existing Shared Key"""
         self.args = self.get_parser.parse_args()
         sharedkey = database.find_sharedkey(sharedkey_id)
         if not sharedkey:

horde/classes/base/user.py

@@ -148,6 +148,7 @@ def get_details(self):
         ret_dict = {
             "username": self.user.get_unique_alias(),
             "id": self.id,
+            "name": self.name,
             "kudos": self.kudos,
             "expiry": self.expiry,
             "utilized": self.utilized,

horde/consts.py

@@ -1,4 +1,4 @@
-HORDE_VERSION = "4.32.2"
+HORDE_VERSION = "4.32.3"
 
 WHITELISTED_SERVICE_IPS = {
     "212.227.227.178",  # Turing Bot

horde/model_reference.py

@@ -1,3 +1,5 @@
+import os
+
 import requests
 
 from horde.logger import logger
@@ -31,11 +33,17 @@ def call_function(self):
         for _riter in range(10):
             try:
                 self.reference = requests.get(
-                    "https://raw.githubusercontent.com/Haidra-Org/AI-Horde-image-model-reference/main/stable_diffusion.json",
+                    os.getenv(
+                        "HORDE_IMAGE_COMPVIS_REFERENCE",
+                        "https://raw.githubusercontent.com/Haidra-Org/AI-Horde-image-model-reference/main/stable_diffusion.json",
+                    ),
                     timeout=2,
                 ).json()
                 diffusers = requests.get(
-                    "https://raw.githubusercontent.com/Haidra-Org/AI-Horde-image-model-reference/main/diffusers.json",
+                    os.getenv(
+                        "HORDE_IMAGE_DIFFUSERS_REFERENCE",
+                        "https://raw.githubusercontent.com/Haidra-Org/AI-Horde-image-model-reference/main/diffusers.json",
+                    ),
                     timeout=2,
                 ).json()
                 self.reference.update(diffusers)
@@ -60,7 +68,10 @@ def call_function(self):
         for _riter in range(10):
             try:
                 self.text_reference = requests.get(
-                    "https://raw.githubusercontent.com/db0/AI-Horde-text-model-reference/main/db.json",
+                    os.getenv(
+                        "HORDE_IMAGE_LLM_REFERENCE",
+                        "https://raw.githubusercontent.com/db0/AI-Horde-text-model-reference/main/db.json",
+                    ),
                     timeout=2,
                 ).json()
                 # logger.debug(self.reference)

prune_stale_images.py

@@ -1,5 +1,5 @@
-import time
 import os
+import time
 from concurrent.futures import ThreadPoolExecutor
 from datetime import datetime, timedelta, timezone