Fix patches

sources/patches/backend-00-settings.py.patch

@@ -1,61 +1,68 @@
+From 865d32e99cb323ef853f6592c69f793e70d68a97 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
+Date: Sun, 3 Dec 2023 12:25:24 +0100
+Subject: [PATCH] Patches for yunohost
+
+---
+ ownphotos/settings.py | 26 ++++++++++++++++++++++----
+ 1 file changed, 22 insertions(+), 4 deletions(-)
+
 diff --git a/ownphotos/settings.py b/ownphotos/settings.py
-index 3449af1..f1a6be7 100644
+index 9cc2eb6..23b7287 100644
 --- a/ownphotos/settings.py
 +++ b/ownphotos/settings.py
-@@ -11,6 +11,7 @@ https://docs.djangoproject.com/en/1.11/ref/settings/
+@@ -11,10 +11,12 @@ https://docs.djangoproject.com/en/1.11/ref/settings/
  """
  import datetime
  import os
 +import ldap, tzlocal
  
  for envvar in (
-     'SECRET_KEY',
+     "SECRET_KEY",
-@@ -76,7 +77,7 @@ CONSTANCE_CONFIG = {
+     "BACKEND_HOST",
-     'IMAGE_DIRS': ("/data", 'Image dirs list (serialized json)', str)
++    "BACKEND_PORT",
+     "DB_BACKEND",
+     "DB_NAME",
+     "DB_USER",
+@@ -77,7 +79,7 @@ CONSTANCE_CONFIG = {
+     "IMAGE_DIRS": ("/data", "Image dirs list (serialized json)", str),
  }
  
--INTERNAL_IPS = ('127.0.0.1', 'localhost', '192.168.1.100')
+-INTERNAL_IPS = ("127.0.0.1", "localhost", "192.168.1.100")
-+INTERNAL_IPS = ('127.0.0.1', 'localhost')
++INTERNAL_IPS = ("127.0.0.1", "localhost")
  
  CORS_ALLOW_HEADERS = (
-     'cache-control',
+     "cache-control",
-@@ -93,10 +94,11 @@ CORS_ALLOW_HEADERS = (
+@@ -94,7 +96,8 @@ CORS_ALLOW_HEADERS = (
-     'x-requested-with',
+     "x-requested-with",
  )
  
--CORS_ORIGIN_WHITELIST = (
+-CORS_ORIGIN_WHITELIST = ("http://localhost:3000", "http://192.168.1.100:3000")
--    'http://localhost:3000',
++BACKEND_PORT = os.environ["HTTP_PORT"]
--    'http://192.168.1.100:3000'
++CORS_ORIGIN_WHITELIST = (f"http://localhost:{BACKEND_PORT}", )
--)
-+BACKEND_PORT=os.environ['httpPort']
-+
-+CORS_ORIGIN_WHITELIST = [
-+    'http://localhost:'  + BACKEND_PORT
-+]
  
  REST_FRAMEWORK = {
-     'DEFAULT_PERMISSION_CLASSES': (
+     "DEFAULT_PERMISSION_CLASSES": ("rest_framework.permissions.IsAuthenticated",),
-@@ -231,7 +233,7 @@ AUTH_PASSWORD_VALIDATORS = [
+@@ -219,7 +222,7 @@ AUTH_PASSWORD_VALIDATORS = [
  
- LANGUAGE_CODE = 'en-us'
+ LANGUAGE_CODE = "en-us"
  
--TIME_ZONE = os.environ['TIME_ZONE']
+-TIME_ZONE = os.environ["TIME_ZONE"]
 +TIME_ZONE = tzlocal.get_localzone().zone
  
  USE_I18N = True
  
-@@ -267,8 +269,8 @@ FULLPHOTO_SIZE = (1000, 1000)
+@@ -258,7 +261,8 @@ DEFAULT_FAVORITE_MIN_RATING = os.environ.get("DEFAULT_FAVORITE_MIN_RATING", 4)
  CORS_ORIGIN_ALLOW_ALL = False
  CORS_ALLOW_CREDENTIALS = True
  
--IMAGE_SIMILARITY_SERVER = 'http://localhost:8002'
+-IMAGE_SIMILARITY_SERVER = "http://localhost:8002"
--
 +IMAGE_SIMILARITY_SERVER_PORT=os.environ['IMAGE_SIMILARITY_SERVER_PORT']
 +IMAGE_SIMILARITY_SERVER = 'http://localhost:' + IMAGE_SIMILARITY_SERVER_PORT
  
- #Must be less or egal of nb core CPU ( Nearly 2GB per process)
+ 
- HEAVYWEIGHT_PROCESS_ENV = os.environ.get('HEAVYWEIGHT_PROCESS', '1')
+ # Must be less or egal of nb core CPU ( Nearly 2GB per process)
-@@ -289,3 +291,12 @@ LOGGING = {
+@@ -282,3 +286,17 @@ LOGGING = {
          },
      },
  }
@@ -67,4 +74,12 @@ index 3449af1..f1a6be7 100644
 +
 +AUTH_LDAP_USER_DN_TEMPLATE = "uid=%(user)s,ou=users,dc=yunohost,dc=org"
 +
-+AUTH_LDAP_USER_ATTR_MAP = {"username": "uid", "first_name": "givenName", "email": "mail", "last_name": "sn"}
++AUTH_LDAP_USER_ATTR_MAP = {
++    "username": "uid",
++    "first_name": "givenName",
++    "email": "mail",
++    "last_name": "sn"
++}
+-- 
+2.43.0
+

sources/patches/backend-01-image_similarity-main.py.patch

@@ -2,8 +2,7 @@ diff --git a/image_similarity/main.py b/image_similarity/main.py
 index 9ca6660..9a33d98 100644
 --- a/image_similarity/main.py
 +++ b/image_similarity/main.py
-@@ -7,6 +7,8 @@ from retrieval_index import RetrievalIndex
+@@ -7,5 +7,7 @@ from retrieval_index import RetrievalIndex
- 
  from utils import logger
  
 +import os
@@ -11,12 +10,12 @@ index 9ca6660..9a33d98 100644
  app = Flask(__name__)
  api = Api(app)
  
-@@ -48,7 +50,7 @@ api.add_resource(SearchIndex,'/search/')
+@@ -48,7 +50,7 @@ api.add_resource(SearchIndex,"/search/")
  
- if __name__ == '__main__':
+ if __name__ == "__main__":
-     logger.info('starting server')
+     logger.info("starting server")
--    server = WSGIServer(('0.0.0.0', 8002), app)
+-    server = WSGIServer(("0.0.0.0", 8002), app)
-+    server = WSGIServer(('0.0.0.0', int(os.environ['IMAGE_SIMILARITY_SERVER_PORT'])), app)
++    server = WSGIServer(("0.0.0.0", int(os.environ["IMAGE_SIMILARITY_SERVER_PORT"])), app)
      server_thread = gevent.spawn(server.serve_forever)
      gevent.joinall([server_thread])