viur-core 3.8.0.dev4__tar.gz → 3.8.0.dev6__tar.gz

{viur_core-3.8.0.dev4 → viur_core-3.8.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: viur-core
-Version: 3.8.0.dev4
+Version: 3.8.0.dev6
 Summary: The core component of ViUR, a development framework for Google App Engine
 Author-email: Mausbrand Informationssysteme GmbH <devs@viur.dev>
 Maintainer-email: Jan Max Meyer <jm@mausbrand.de>
@@ -45,6 +45,7 @@ Requires-Dist: appengine-python-standard~=1.0
 Requires-Dist: Deprecated~=1.2
 Requires-Dist: google-api-core[grpc]~=2.0
 Requires-Dist: google-auth~=2.0
+Requires-Dist: google-cloud-bigquery~=3.0
 Requires-Dist: google-cloud-datastore~=2.0
 Requires-Dist: google-cloud-iam~=2.0
 Requires-Dist: google-cloud-logging~=3.0

{viur_core-3.8.0.dev4 → viur_core-3.8.0.dev6}/pyproject.toml

@@ -10,6 +10,7 @@ dependencies = [
     "Deprecated~=1.2",
     "google-api-core[grpc]~=2.0",
     "google-auth~=2.0",
+    "google-cloud-bigquery~=3.0",
     "google-cloud-datastore~=2.0",
     "google-cloud-iam~=2.0",
     "google-cloud-logging~=3.0",

{viur_core-3.8.0.dev4 → viur_core-3.8.0.dev6}/src/viur/core/__init__.py

@@ -153,11 +153,20 @@ def __build_app(modules: ModuleType | object, renderers: ModuleType | object, de
     from viur.core.modules.script import Script  # noqa: E402 # import works only here because circular imports
     from viur.core.modules.translation import Translation  # noqa: E402 # import works only here because circular imports
     from viur.core.prototypes.instanced_module import InstancedModule  # noqa: E402 # import works only here because circular imports
-
-    modules._tasks = TaskHandler
-    modules._moduleconf = ModuleConf
-    modules._translation = Translation
-    modules.script = Script
+    from viur.core.modules.history import History  # noqa: E402 # import works only here because circular imports
+
+    for name, cls in {
+        "_tasks": TaskHandler,
+        "_moduleconf": ModuleConf,
+        "_translation": Translation,
+        "_history": History,
+        "script": Script,
+    }.items():
+        # Check whether name is contained in modules so that it can be overwritten
+        if name not in vars(modules):
+            setattr(modules, name, cls)
+
+        assert issubclass(getattr(modules, name), cls)
 
     # Resolver defines the URL mapping
     resolver = {}

{viur_core-3.8.0.dev4 → viur_core-3.8.0.dev6}/src/viur/core/bones/__init__.py

@@ -19,6 +19,7 @@ from .credential import CredentialBone
 from .date import DateBone
 from .email import EmailBone
 from .file import FileBone
+from .image import ImageBone
 from .json import JsonBone
 from .key import KeyBone
 from .numeric import NumericBone
@@ -60,6 +61,7 @@ __all = [
     "DateBone",
     "EmailBone",
     "FileBone",
+    "ImageBone",
     "JsonBone",
     "KeyBone",
     "MultipleConstraints",

{viur_core-3.8.0.dev4 → viur_core-3.8.0.dev6}/src/viur/core/bones/base.py

@@ -1070,7 +1070,7 @@ class BaseBone(object):
                         db_obj[name] = value
                         db.put(db_obj)
 
-                    if db.IsInTransaction():
+                    if db.is_in_transaction():
                         transact()
                     else:
                         db.run_in_transaction(transact)

viur_core-3.8.0.dev6/src/viur/core/bones/image.py

@@ -0,0 +1,36 @@
+import typing as t
+from .. import i18n
+from .file import FileBone
+from .string import StringBone
+from ..skeleton.relskel import RelSkel
+from ..config import conf
+
+
+class ImageBoneRelSkel(RelSkel):
+    alt = StringBone(
+        descr=i18n.translate(
+            "viur.core.image.alt",
+            defaultText="Alternative description",
+        ),
+        searchable=True,
+        languages=conf.i18n.available_languages,
+    )
+
+
+class ImageBone(FileBone):
+    type = FileBone.type + ".image"
+
+    def __init__(
+        self,
+        *,
+        public: bool = True,
+        using: t.Optional[RelSkel] = ImageBoneRelSkel,
+        validMimeTypes: None | t.Iterable[str] = ["image/*"],
+        **kwargs,
+    ):
+        super().__init__(
+            public=public,
+            using=using,
+            validMimeTypes=validMimeTypes,
+            **kwargs,
+        )

{viur_core-3.8.0.dev4 → viur_core-3.8.0.dev6}/src/viur/core/bones/uid.py

@@ -25,7 +25,7 @@ def generate_number(db_key: db.Key) -> int:
             raise ValueError("Can't set the Uid")
         return db_obj["count"]
 
-    if db.IsInTransaction():
+    if db.is_in_transaction():
         return transact(db_key)
     else:
         return db.run_in_transaction(transact, db_key)

{viur_core-3.8.0.dev4 → viur_core-3.8.0.dev6}/src/viur/core/config.py

@@ -577,6 +577,15 @@ class Email(ConfigType):
     }
 
 
+class History(ConfigType):
+    databases: Multiple[str] = ["viur"]
+    """All history related settings."""
+    excluded_actions: Multiple[str] = []
+    """List of all action that are should not be logged."""
+    excluded_kinds: Multiple[str] = []
+    """List of all kinds that should be logged."""
+
+
 class I18N(ConfigType):
     """All i18n, multilang related settings."""
 
@@ -910,6 +919,7 @@ class Conf(ConfigType):
     skeleton_search_path: Multiple[str] = [
         "/skeletons/",  # skeletons of the project
         "/viur/core/",  # system-defined skeletons of viur-core
+        "/viur/src/viur/core/",  # fixme: test suite
         "/viur-core/core/"  # system-defined skeletons of viur-core, only used by editable installation
     ]
     """Priority, in which skeletons are loaded"""
@@ -984,6 +994,7 @@ class Conf(ConfigType):
         self.i18n = I18N(parent=self)
         self.user = User(parent=self)
         self.instance = Instance(parent=self)
+        self.history = History(parent=self)
 
     _mapping = {
         # debug

{viur_core-3.8.0.dev4 → viur_core-3.8.0.dev6}/src/viur/core/modules/file.py

@@ -23,10 +23,9 @@ from google.appengine.api import blobstore, images
 from google.cloud import storage
 from google.oauth2.service_account import Credentials as ServiceAccountCredentials
 
-from viur.core import conf, current, db, errors, utils
+from viur.core import conf, current, db, errors, utils, i18n
 from viur.core.bones import BaseBone, BooleanBone, KeyBone, NumericBone, StringBone
 from viur.core.decorators import *
-from viur.core.i18n import LanguageWrapper
 from viur.core.prototypes.tree import SkelType, Tree, TreeSkel
 from viur.core.skeleton import SkeletonInstance, skeletonByKind
 from viur.core.tasks import CallDeferred, DeleteEntitiesIter, PeriodicTask
@@ -303,6 +302,22 @@ class FileLeafSkel(TreeSkel):
     """
     kindName = "file"
 
+    name = StringBone(
+        descr="Filename",
+        caseSensitive=False,
+        searchable=True,
+        vfunc=lambda val: None if File.is_valid_filename(val) else "Invalid filename provided",
+    )
+
+    alt = StringBone(
+        descr=i18n.translate(
+            "viur.core.image.alt",
+            defaultText="Alternative description",
+        ),
+        searchable=True,
+        languages=conf.i18n.available_languages,
+    )
+
     size = StringBone(
         descr="Size",
         readOnly=True,
@@ -314,13 +329,6 @@ class FileLeafSkel(TreeSkel):
         readOnly=True,
     )
 
-    name = StringBone(
-        descr="Filename",
-        caseSensitive=False,
-        searchable=True,
-        vfunc=lambda val: None if conf.main_app.file.is_valid_filename(val) else "Invalid filename provided",
-    )
-
     mimetype = StringBone(
         descr="MIME-Type",
         readOnly=True,
@@ -713,7 +721,7 @@ class File(Tree):
         if not file:
             return ""
 
-        if isinstance(file, LanguageWrapper):
+        if isinstance(file, i18n.LanguageWrapper):
             language = language or current.language.get()
             if not language or not (file := cls.get(language)):
                 return ""