oarepo-runtime 1.5.64__tar.gz → 1.5.66__tar.gz

{oarepo_runtime-1.5.64/oarepo_runtime.egg-info → oarepo_runtime-1.5.66}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oarepo-runtime
-Version: 1.5.64
+Version: 1.5.66
 Summary: A set of runtime extensions of Invenio repository
 Description-Content-Type: text/markdown
 License-File: LICENSE

oarepo_runtime-1.5.66/oarepo_runtime/info/check.py

@@ -0,0 +1,96 @@
+import json, random
+from flask import Response, Blueprint
+from flask import current_app as flask_current_app
+from invenio_db import db # sql alchemy session
+from invenio_cache import current_cache # redis
+import redis
+from invenio_search import current_search_client # opensearch
+from celery import current_app as celery_current_app, shared_task
+
+
+def check_db_connection():
+    if not has_database_connection():
+        return "DB connection failed"
+    else:
+        return "ok"
+
+def has_database_connection():
+    try:
+        db.session.begin()
+        db.session.execute("select * from alembic_version").scalar()
+        return True
+    except:
+        return False
+    finally:
+        db.session.rollback()
+
+def check_cache_connection():
+    try:
+        rand = random.randint(1, 1000)
+        if current_cache.set('mykey', str(rand)):
+            val = current_cache.get('mykey')
+            if val == str(rand):
+                return "ok"
+            else:
+                return "Cache returned unexpected value."
+        else:
+            return "Failed to set cache key."
+    except redis.exceptions.ConnectionError as e:
+        if isinstance(e.__cause__, ConnectionRefusedError):
+            return "Cache connection error"
+        return "Cache exception"
+    except Exception as other:
+        return str(other)
+
+
+
+#  https://github.com/celery/celery/issues/4283
+def check_message_queue():
+    from kombu.exceptions import OperationalError
+    try:
+        #celery_current_app.autodiscover_tasks(['oarepo_runtime.info'])
+        ping_task = celery_current_app.send_task('ping')
+        if ping_task.get(timeout=2) == 'pong':
+            return "ok"
+    except OperationalError as e:
+        if isinstance(e.__cause__, ConnectionRefusedError):
+            return "RabbitMQ connection refused"
+        return "Other RabbitMQ-related error"
+    except Exception as other:
+        return str(other)
+
+
+def check_opensearch():
+    try:
+        is_available = current_search_client.ping()
+        if is_available:
+            return "ok"
+        else:
+            return "OpenSearch is not available"
+    except Exception as e:
+        return str(e)
+
+
+blueprint = Blueprint("repository-check", __name__, url_prefix="/.well-known")
+
+@blueprint.route("/check")
+def check_connections() -> Response:
+    """
+    Function to check all necessary connections (database, redis, rabbitmq, opensearch)
+    Return Response 200 if everything is OK or Response 500 with json and all failed tests
+    """
+    check_list = {}
+    with flask_current_app.app_context():
+        check_list['db'] = check_db_connection()
+        check_list['cache'] = check_cache_connection()
+        check_list['mq'] = check_message_queue()
+        check_list['opensearch'] = check_opensearch()
+
+    failed_checks = {key: value for key, value in check_list.items() if value != 'ok'}
+
+    if failed_checks:
+        return Response(json.dumps(failed_checks), status=500, content_type='application/json')
+
+    return Response(json.dumps(check_list), status=200, content_type='application/json') # good
+
+

{oarepo_runtime-1.5.64 → oarepo_runtime-1.5.66}/oarepo_runtime/records/systemfields/selectors.py

@@ -1,7 +1,10 @@
-from typing import Any, Callable, List
+import dataclasses
+from typing import Any, Callable, List, Protocol, Tuple
 
+from oarepo_runtime.records.relations.lookup import lookup_key
 
-class Selector:
+
+class Selector(Protocol):
     def select(self, record) -> List[Any]:
         return []
 
@@ -25,6 +28,7 @@ class FirstItemSelector(PathSelector):
         return []
 
 
+@dataclasses.dataclass
 class FilteredSelector(Selector):
     """
     Selector which filters output of another selector
@@ -43,17 +47,9 @@ class FilteredSelector(Selector):
         }
     }
     """
-
-    def __init__(
-        self,
-        selector: Selector,
-        filter: Callable[[Any], bool],
-        projection: Callable[[Any], Any] | str = None,
-    ):
-
-        self.selector = selector
-        self.filter = filter
-        self.projection = projection
+    selector: Selector
+    filter: Callable[[Any], bool]
+    projection: Callable[[Any], Any] | str = None
 
     def select(self, record):
         selected = self.selector.select(record)
@@ -62,10 +58,7 @@ class FilteredSelector(Selector):
             ret = []
             for select_element in selected:
                 if isinstance(self.projection, str):
-                    if isinstance(select_element, dict) and self.projection in select_element:
-                        result = select_element[self.projection]
-                    else:
-                        result = []
+                    result = [x.value for x in lookup_key(select_element, self.projection)]
                 else:
                     result = self.projection(select_element)
                 if isinstance(result, list):
@@ -77,6 +70,7 @@ class FilteredSelector(Selector):
         return ret
 
 
+@dataclasses.dataclass
 class MultiSelector(Selector):
     """Selector concatenating outputs of multiple selectors"""
 

oarepo_runtime-1.5.66/oarepo_runtime/tasks.py

@@ -0,0 +1,6 @@
+from celery import shared_task
+
+# TODO priority if something big is in queue already
+@shared_task(name='ping')
+def ping():
+    return 'pong'

{oarepo_runtime-1.5.64 → oarepo_runtime-1.5.66/oarepo_runtime.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oarepo-runtime
-Version: 1.5.64
+Version: 1.5.66
 Summary: A set of runtime extensions of Invenio repository
 Description-Content-Type: text/markdown
 License-File: LICENSE

{oarepo_runtime-1.5.64 → oarepo_runtime-1.5.66}/oarepo_runtime.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ oarepo_runtime/ext.py
 oarepo_runtime/ext_config.py
 oarepo_runtime/profile.py
 oarepo_runtime/proxies.py
+oarepo_runtime/tasks.py
 oarepo_runtime/uow.py
 oarepo_runtime.egg-info/PKG-INFO
 oarepo_runtime.egg-info/SOURCES.txt
@@ -53,6 +54,7 @@ oarepo_runtime/datastreams/writers/validation_errors.py
 oarepo_runtime/datastreams/writers/yaml.py
 oarepo_runtime/i18n/__init__.py
 oarepo_runtime/info/__init__.py
+oarepo_runtime/info/check.py
 oarepo_runtime/info/views.py
 oarepo_runtime/records/__init__.py
 oarepo_runtime/records/dumpers/__init__.py

{oarepo_runtime-1.5.64 → oarepo_runtime-1.5.66}/oarepo_runtime.egg-info/entry_points.txt

@@ -5,7 +5,9 @@ oarepo_runtime = oarepo_runtime.ext:OARepoRuntime
 oarepo_runtime = oarepo_runtime.ext:OARepoRuntime
 
 [invenio_base.blueprints]
+oarepo_runtime_check = oarepo_runtime.info.check:blueprint
 oarepo_runtime_info = oarepo_runtime.info.views:create_wellknown_blueprint
 
 [invenio_celery.tasks]
+oarepo_runtime_check = oarepo_runtime.tasks
 oarepo_runtime_datastreams = oarepo_runtime.datastreams

{oarepo_runtime-1.5.64 → oarepo_runtime-1.5.66}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-runtime
-version = 1.5.64
+version = 1.5.66
 description = A set of runtime extensions of Invenio repository
 authors = Alzbeta Pokorna
 readme = README.md
@@ -50,8 +50,10 @@ invenio_base.api_apps =
 	oarepo_runtime = oarepo_runtime.ext:OARepoRuntime
 invenio_celery.tasks = 
 	oarepo_runtime_datastreams = oarepo_runtime.datastreams
+	oarepo_runtime_check = oarepo_runtime.tasks
 invenio_base.blueprints = 
 	oarepo_runtime_info = oarepo_runtime.info.views:create_wellknown_blueprint
+	oarepo_runtime_check = oarepo_runtime.info.check:blueprint
 
 [oarepo.i18n]
 languages =