oarepo-runtime 1.6.1__tar.gz → 1.7.0__tar.gz

{oarepo_runtime-1.6.1/oarepo_runtime.egg-info → oarepo_runtime-1.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oarepo-runtime
-Version: 1.6.1
+Version: 1.7.0
 Summary: A set of runtime extensions of Invenio repository
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -21,6 +21,7 @@ Requires-Dist: autoflake; extra == "dev"
 Requires-Dist: oarepo-tools; extra == "dev"
 Provides-Extra: tests
 Requires-Dist: pytest>=7.1.2; extra == "tests"
+Requires-Dist: pytest-oarepo; extra == "tests"
 Requires-Dist: psutil; extra == "tests"
 Dynamic: license-file
 

{oarepo_runtime-1.6.1 → oarepo_runtime-1.7.0}/oarepo_runtime/cli/__init__.py

@@ -1,5 +1,6 @@
 from .assets import assets
 from .base import as_command, oarepo
+from .cf import cf
 from .check import check
 from .configuration import configuration_command
 from .fixtures import fixtures
@@ -17,4 +18,5 @@ __all__ = (
     "fixtures",
     "configuration_command",
     "permissions",
+    "cf",
 )

{oarepo_runtime-1.6.1 → oarepo_runtime-1.7.0}/oarepo_runtime/ext.py

@@ -1,11 +1,32 @@
 from functools import cached_property
 
+import pytz
+from flask import current_app, session
+from invenio_accounts.models import User
 from invenio_base.utils import obj_or_import_string
 
-import oarepo_runtime.cli.cf  # noqa, just to register
-
 from .cli import oarepo as oarepo_cmd
 from .datastreams.ext import OARepoDataStreamsExt
+from .proxies import current_timezone
+
+
+def set_timezone():
+    if "timezone" in session:
+        current_timezone.set(pytz.timezone(session["timezone"]))
+    else:
+        default_user_timezone = current_app.config.get("BABEL_DEFAULT_TIMEZONE")
+        if default_user_timezone:
+            current_timezone.set(pytz.timezone(default_user_timezone))
+        else:
+            current_timezone.set(None)
+
+
+def on_identity_changed(sender, identity):
+    if "timezone" not in session and "_user_id" in session:
+        user = User.query.filter_by(id=session["_user_id"]).first()
+        if user and "timezone" in user.preferences:
+            session["timezone"] = user.preferences["timezone"]
+    set_timezone()
 
 
 class OARepoRuntime(object):
@@ -24,6 +45,11 @@ class OARepoRuntime(object):
         app.extensions["oarepo-datastreams"] = OARepoDataStreamsExt(app)
         app.cli.add_command(oarepo_cmd)
 
+        from flask_principal import identity_changed
+
+        identity_changed.connect(on_identity_changed, self.app)
+        app.before_request(set_timezone)
+
     @cached_property
     def owner_entity_resolvers(self):
         return [
@@ -33,9 +59,10 @@ class OARepoRuntime(object):
     @cached_property
     def rdm_excluded_components(self):
         return [
-            obj_or_import_string(x) for x in self.app.config.get("RDM_EXCLUDED_COMPONENTS", [])
+            obj_or_import_string(x)
+            for x in self.app.config.get("RDM_EXCLUDED_COMPONENTS", [])
         ]
-        
+
     def init_config(self, app):
         """Initialize configuration."""
         from . import ext_config

{oarepo_runtime-1.6.1 → oarepo_runtime-1.7.0}/oarepo_runtime/proxies.py

@@ -1,6 +1,8 @@
 from flask import current_app
 from werkzeug.local import LocalProxy
+from contextvars import ContextVar
 
+current_timezone = ContextVar('timezone') #idk how or exactly why to use the LocalProxy here
 current_datastreams = LocalProxy(lambda: current_app.extensions["oarepo-datastreams"])
 current_oarepo = LocalProxy(lambda: current_app.extensions["oarepo-runtime"])
 """Helper proxy to get the current datastreams."""

{oarepo_runtime-1.6.1 → oarepo_runtime-1.7.0}/oarepo_runtime/services/schema/rdm.py

@@ -15,6 +15,8 @@ from marshmallow_utils.fields import (
 from marshmallow_utils.fields.nestedattr import NestedAttribute
 from marshmallow_utils.schemas.identifier import IdentifierSchema
 
+from .i18n import MultilingualField
+
 
 class RDMRecordMixin(ma.Schema):
     versions = NestedAttribute(VersionsSchema, dump_only=True)
@@ -60,3 +62,14 @@ class RelatedRecordIdentifierField(IdentifierSet):
             *args,
             **kwargs
         )
+
+
+class RDMSubjectSchema(ma.Schema):
+    """Subject ui schema."""
+
+    class Meta:
+        unknown = ma.RAISE
+
+    _id = ma.fields.String(data_key="id")
+
+    subject = MultilingualField()

{oarepo_runtime-1.6.1 → oarepo_runtime-1.7.0}/oarepo_runtime/services/schema/rdm_ui.py

@@ -4,6 +4,8 @@ from oarepo_vocabularies.services.ui_schema import VocabularyI18nStrUIField
 
 from oarepo_runtime.services.schema.marshmallow import DictOnlySchema
 
+from .i18n_ui import MultilingualUIField
+
 
 class RDMIdentifierWithSchemaUISchema(ma.Schema):
     scheme = ma.fields.String(
@@ -141,3 +143,14 @@ class RDMCreatorsUISchema(ma.Schema):
     )
 
     person_or_org = ma.fields.Nested(RDMPersonOrOrganizationUISchema())
+
+
+class RDMSubjectUISchema(ma.Schema):
+    """Subject ui schema."""
+
+    class Meta:
+        unknown = ma.RAISE
+
+    _id = ma.fields.String(data_key="id")
+
+    subject = MultilingualUIField()

{oarepo_runtime-1.6.1 → oarepo_runtime-1.7.0}/oarepo_runtime/services/schema/ui.py

@@ -100,11 +100,18 @@ class MultilayerFormatEDTF(BabelFormatField):
             return super().parse(value, **kwargs)
         raise ValueError("Not a valid date")
 
+class TimezoneMixin: #i'm not sure about where this should be used
+    @property
+    def tzinfo(self):
+        from oarepo_runtime.proxies import current_timezone
+        try:
+            return current_timezone.get()
+        except LookupError:
+            return
 
-class LocalizedDateTime(LocalizedMixin, FormatDatetime):
+class LocalizedDateTime(TimezoneMixin, LocalizedMixin, FormatDatetime):
     pass
 
-
 class LocalizedTime(LocalizedMixin, FormatTimeString):
     pass
 

{oarepo_runtime-1.6.1 → oarepo_runtime-1.7.0/oarepo_runtime.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oarepo-runtime
-Version: 1.6.1
+Version: 1.7.0
 Summary: A set of runtime extensions of Invenio repository
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -21,6 +21,7 @@ Requires-Dist: autoflake; extra == "dev"
 Requires-Dist: oarepo-tools; extra == "dev"
 Provides-Extra: tests
 Requires-Dist: pytest>=7.1.2; extra == "tests"
+Requires-Dist: pytest-oarepo; extra == "tests"
 Requires-Dist: psutil; extra == "tests"
 Dynamic: license-file
 

{oarepo_runtime-1.6.1 → oarepo_runtime-1.7.0}/oarepo_runtime.egg-info/requires.txt

@@ -17,4 +17,5 @@ oarepo-tools
 
 [tests]
 pytest>=7.1.2
+pytest-oarepo
 psutil

{oarepo_runtime-1.6.1 → oarepo_runtime-1.7.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-runtime
-version = 1.6.1
+version = 1.7.0
 description = A set of runtime extensions of Invenio repository
 authors = Alzbeta Pokorna
 readme = README.md
@@ -33,6 +33,7 @@ dev =
 	oarepo-tools
 tests = 
 	pytest>=7.1.2
+	pytest-oarepo
 	psutil
 
 [options.package_data]