oarepo-runtime 1.5.49__py3-none-any.whl → 1.5.51__py3-none-any.whl

oarepo_runtime/cli/assets.py

@@ -79,7 +79,7 @@ def enumerate_assets():
     return aliases, asset_dirs
 
 
-COMPONENT_RE = re.compile(
+COMPONENT_LIST_RE = re.compile(
     r"""
 ^
 \s*
@@ -87,15 +87,29 @@ COMPONENT_RE = re.compile(
 \s*
 {    
 \s*
+(
+    @import\s+["'](.*?)["']
+    \s*
+    ;
+)+
+\s*
+}""",
+    re.MULTILINE | re.DOTALL | re.VERBOSE,
+)
+
+COMPONENT_RE = re.compile(
+    r"""
+\s*
 @import\s+["'](.*?)["']
 \s*
 ;
 \s*
-}""",
+""",
     re.MULTILINE | re.DOTALL | re.VERBOSE,
 )
 
 
+
 @assets.command(name="less-components")
 @click.argument("output_file", default="-")
 @with_appcontext
@@ -110,8 +124,9 @@ def less_components(output_file):
                 less_component_files.append(f)
     components = set()
     for cmp_file in less_component_files:
-        for s in COMPONENT_RE.findall(cmp_file.read_text()):
-            components.add(Path(s).stem)
+        for component_list in COMPONENT_LIST_RE.findall(cmp_file.read_text()):
+            for s in COMPONENT_RE.findall(component_list[0]):
+                components.add(Path(s).stem)
     data = {"components": list(sorted(components))}
     if output_file == "-":
         print(json.dumps(data, indent=4, ensure_ascii=False))

oarepo_runtime/services/schema/validation.py

@@ -1,11 +1,22 @@
 import functools
 import re
 from datetime import datetime
+from idutils import normalize_pid
 
 from marshmallow.exceptions import ValidationError
 from marshmallow_utils.fields.edtfdatestring import EDTFValidator
 
 
+def validate_identifier(value):
+    try:
+        value["identifier"] = normalize_pid(
+            value["identifier"], value["scheme"].lower()
+        )
+    except:
+        raise ValidationError(f"Invalid {value['scheme']} value {value['identifier']}")
+    return value
+
+
 def validate_date(date_format):
     def validate(value):
         try:

{oarepo_runtime-1.5.49.dist-info → oarepo_runtime-1.5.51.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oarepo-runtime
-Version: 1.5.49
+Version: 1.5.51
 Summary: A set of runtime extensions of Invenio repository
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -12,6 +12,7 @@ Requires-Dist: flask-babelex
 Requires-Dist: deepmerge
 Requires-Dist: tqdm
 Requires-Dist: deprecated
+Requires-Dist: idutils
 Provides-Extra: dev
 Requires-Dist: pytest>=7.1.2; extra == "dev"
 Requires-Dist: black; extra == "dev"

{oarepo_runtime-1.5.49.dist-info → oarepo_runtime-1.5.51.dist-info}/RECORD

@@ -5,7 +5,7 @@ oarepo_runtime/profile.py,sha256=QzrQoZncjoN74ZZnpkEKakNk08KCzBU7m6y42RN8AMY,163
 oarepo_runtime/proxies.py,sha256=NN_WNj1xuKc-OveoZmzvTFlUonNjSmLIGsv_JUcHGls,285
 oarepo_runtime/uow.py,sha256=iyF3R2oCPSVUu38GXoxZallgRD-619q1fWTb8sSaeyQ,4412
 oarepo_runtime/cli/__init__.py,sha256=daAODgUAB9Nb0O0Kg8vSgJIPKJm92EHMTRuoKwxBCug,373
-oarepo_runtime/cli/assets.py,sha256=C9CEwCBGeSF6ztM-T37t0XQ3KoTF0nKlhB6vTRxDt2A,3357
+oarepo_runtime/cli/assets.py,sha256=uKhR2ywDR3RgGyWXuE2X-YNG0Cx-QxXJxHkAJEVV-_Y,3589
 oarepo_runtime/cli/base.py,sha256=94RBTa8TOSPxEyEUmYLGXaWen-XktP2-MIbTtZSlCZo,544
 oarepo_runtime/cli/cf.py,sha256=W0JEJK2JqKubQw8qtZJxohmADDRUBode4JZAqYLDGvc,339
 oarepo_runtime/cli/check.py,sha256=sCe2PeokSHvNOXHFZ8YHF8NMhsu5nYjyuZuvXHJ6X18,5092
@@ -107,7 +107,7 @@ oarepo_runtime/services/schema/marshmallow.py,sha256=LmcSxvbZ9jIhkNHCqqxt1SA2UNi
 oarepo_runtime/services/schema/oneofschema.py,sha256=GnWH4Or_G5M0NgSmCoqMI6PBrJg5AC9RHrcB5QDKRq0,6661
 oarepo_runtime/services/schema/polymorphic.py,sha256=bAbUoTIeDBiJPYPhpLEKKZekEdkHlpqkmNxk1hN3PDw,564
 oarepo_runtime/services/schema/ui.py,sha256=xQgW-zLyZoHldGw47uVtXQj-5LexVNKTholyq4MiBZo,3777
-oarepo_runtime/services/schema/validation.py,sha256=fahqKGDdIYWux5ZeoljrEe8VD2fDZR9VpfvYmTYAmpw,1050
+oarepo_runtime/services/schema/validation.py,sha256=uIDJ0Phh62tDE0Mme-7Z3R_2TZY7k0MwjB3hrn5be_g,1356
 oarepo_runtime/translations/default_translations.py,sha256=060GBlA1ghWxfeumo6NqxCCZDb-6OezOuF6pr-_GEOQ,104
 oarepo_runtime/translations/jinjax_messages.jinja,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/translations/messages.pot,sha256=QvwHdrmqwaYpZIsnVTEmsk7MnG8J2Sy32_8aGFyfz_o,1303
@@ -119,9 +119,9 @@ oarepo_runtime/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 oarepo_runtime/utils/functools.py,sha256=gKS9YZtlIYcDvdNA9cmYO00yjiXBYV1jg8VpcRUyQyg,1324
 oarepo_runtime/utils/path.py,sha256=V1NVyk3m12_YLbj7QHYvUpE1wScO78bYsX1LOLeXDkI,3108
 tests/pkg_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oarepo_runtime-1.5.49.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.49.dist-info/METADATA,sha256=FPq2iWKF0kCGw2nu6h4EnTKAWKyM4S_ruEFRbtAsHCc,4697
-oarepo_runtime-1.5.49.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-oarepo_runtime-1.5.49.dist-info/entry_points.txt,sha256=QrlXAKuPDVBinaSh_v3yO9_Nb9ZNmJCJ0VFcCW-z0Jg,327
-oarepo_runtime-1.5.49.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.49.dist-info/RECORD,,
+oarepo_runtime-1.5.51.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.51.dist-info/METADATA,sha256=N3Ifs2L5-w8j5mTyfuT3S1JzU2my5cyUJyoiLRDnQwc,4720
+oarepo_runtime-1.5.51.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+oarepo_runtime-1.5.51.dist-info/entry_points.txt,sha256=QrlXAKuPDVBinaSh_v3yO9_Nb9ZNmJCJ0VFcCW-z0Jg,327
+oarepo_runtime-1.5.51.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.51.dist-info/RECORD,,