muninn 6.4.2__tar.gz → 7.0__tar.gz

{muninn-6.4.2 → muninn-7.0}/CHANGES

@@ -1,3 +1,17 @@
+7.0 2025-08-14
+~~~~~~~~~~~~~~
+
+* Added catalogue synchronizer functionality to muninn. This introduces
+  muninn-sync, archive.sync(), and a new synchronizer extension interface.
+
+* Added -n/--name-only option to muninn-info.
+
+6.5 2025-03-25
+~~~~~~~~~~~~~~
+
+* Added support for optional `auth_args` setting in credentials file for
+  oauth2 token requests.
+
 6.4.2 2025-02-24
 ~~~~~~~~~~~~~~~~
 

{muninn-6.4.2 → muninn-7.0}/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2014-2024 S[&]T, The Netherlands.
+Copyright (C) 2014-2025 S[&]T, The Netherlands.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

{muninn-6.4.2 → muninn-7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: muninn
-Version: 6.4.2
+Version: 7.0
 Summary: Data product catalogue and archive system
 Home-page: https://github.com/stcorp/muninn
 Author: S[&]T

{muninn-6.4.2 → muninn-7.0}/muninn/__init__.py

@@ -1,11 +1,11 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function
 
-__version__ = "6.4.2"
-__copyright__ = "Copyright (C) 2014-2024 S[&]T, The Netherlands."
+__version__ = "7.0.0"
+__copyright__ = "Copyright (C) 2014-2025 S[&]T, The Netherlands."
 
 __all__ = ["Error", "InternalError", "Struct", "Archive", "open", "config_path"]
 
@@ -14,7 +14,7 @@ import sys as _sys
 
 from muninn._compat import urlparse as _urlparse
 from muninn.archive import Archive
-from muninn.exceptions import *
+from muninn.exceptions import Error, InternalError, StorageError
 from muninn.struct import Struct
 
 

{muninn-6.4.2 → muninn-7.0}/muninn/archive.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function
@@ -56,6 +56,7 @@ class _ArchiveConfig(Mapping):
     product_type_extensions = _ExtensionList(optional=True)
     remote_backend_extensions = _ExtensionList(optional=True)
     hook_extensions = _ExtensionList(optional=True)
+    synchronizers = _ExtensionList(optional=True)
     auth_file = Text(optional=True)
     tempdir = Text(optional=True)
 
@@ -91,6 +92,15 @@ def _load_extension(name):
     return sys.modules[name]
 
 
+def _load_synchronizer_module(name):
+    try:
+        __import__(name)
+    except ImportError as e:
+        raise Error("import of syncrhonizer %r failed (%s)" % (name, e))
+
+    return sys.modules[name]
+
+
 def _inspect_nargs(func):
     try:
         getargspec = inspect.getfullargspec
@@ -161,12 +171,12 @@ class Archive(object):
         options = config.parse(configuration.get("archive", {}), _ArchiveConfig)
         _ArchiveConfig.validate(options)
 
-        # Load and create the database backend.
+        # Load and create the database backend
         database_name = options.pop('database')
         database_module = _load_database_module(database_name)
         database = database_module.create(configuration)
 
-        # Load and create the storage backend.
+        # Load and create the storage backend
         storage_name = options.pop('storage')
         if storage_name == 'none':
             storage = None
@@ -174,18 +184,19 @@ class Archive(object):
             storage_module = _load_storage_module(storage_name)
             storage = storage_module.create(configuration, options.get('tempdir', None), options.get('auth_file', None))
 
-        # Create the archive.
+        # Create the archive
         namespace_extensions = options.pop("namespace_extensions", [])
         product_type_extensions = options.pop("product_type_extensions", [])
         remote_backend_extensions = options.pop("remote_backend_extensions", [])
         hook_extensions = options.pop("hook_extensions", [])
+        synchronizers = options.pop("synchronizers", [])
         archive = Archive(database=database, storage=storage, id=id,
                           configuration=configuration, **options)
 
-        # Register core namespace.
+        # Register core namespace
         archive.register_namespace("core", Core)
 
-        # Register custom extensions.
+        # Register custom extensions
         for name in namespace_extensions:
             extension = _load_extension(name)
             _register_extension(archive, extension, name, 'namespace')
@@ -202,6 +213,10 @@ class Archive(object):
             extension = _load_extension(name)
             _register_extension(archive, extension, name, 'hook_extension')
 
+        # Register synchronizers
+        for synchronizer in synchronizers:
+            archive.register_synchronizer(synchronizer)
+
         return archive
 
     def __init__(self, database, storage, cascade_grace_period=0,
@@ -217,6 +232,7 @@ class Archive(object):
         self._product_type_plugins = {}
         self._remote_backend_plugins = {}
         self._hook_extensions = collections.OrderedDict()
+        self._synchronizers = {}
 
         self._export_formats = set()
 
@@ -377,6 +393,49 @@ class Archive(object):
         """Return a list of supported hook extensions."""
         return list(self._hook_extensions.keys())
 
+    def register_synchronizer(self, synchronizer):
+        """Register a synchronizer.
+
+        Arguments:
+        synchronizer -- Synchronizer name
+        """
+        if synchronizer in self._synchronizers:
+            raise Error("redefinition of synchronizer: \"%s\"" % synchronizer)
+
+        if "synchronizer:" + synchronizer not in self._configuration:
+            raise Error("missing synchronizer \"%s\" configuration" % (synchronizer))
+        config_section = self._configuration.get('synchronizer:' + synchronizer)
+
+        if "module" not in config_section:
+            raise Error("missing module option for synchronizer \"%s\"" % (synchronizer))
+        module_name = config_section.pop("module")
+        module = _load_synchronizer_module(module_name)
+
+        if not hasattr(module, "synchronizer"):
+            raise Error("synchronizer \"%s\" does not implement the synchronizer API" % (synchronizer))
+
+        plugin = module.synchronizer(config_section)
+        if not hasattr(plugin, "sync"):
+            raise Error("missing 'sync' method in plugin for synchronizer \"%s\"" % (synchronizer))
+
+        self._synchronizers[synchronizer] = plugin
+
+    def synchronizer(self, synchronizer):
+        """Return the synchronizer with the specified name.
+
+        Arguments:
+        synchronizer -- Synchronizer name
+        """
+        if synchronizer not in self._synchronizers:
+            raise Error("unregistered synchronizer: \"%s\"; registered synchronizers: %s" %
+                        (synchronizer, util.quoted_list(self._synchronizers.keys())))
+
+        return self._synchronizers[synchronizer]
+
+    def synchronizers(self):
+        """Return a list of supported synchronizers"""
+        return list(self._synchronizers.keys())
+
     def _analyze_paths(self, plugin, paths):
         metadata = plugin.analyze(paths)
 
@@ -442,7 +501,7 @@ class Archive(object):
             assert len(products) == 1
             return products[0]
 
-    def _get_products(self, where, parameters=None, namespaces=None, property_names=None):  # TODO generator?
+    def _get_products(self, where, parameters=None, namespaces=None, property_names=None):
         if isinstance(where, basestring):
             return self.search(where, parameters=parameters, namespaces=namespaces, property_names=property_names)
 
@@ -532,9 +591,6 @@ class Archive(object):
 
     def _retrieve(self, product, target_path, use_symlinks=False, verify_hash=False):
         if 'archive_path' in product.core:
-            # Determine the path of the product in storage.
-            product_path = self._product_path(product)
-
             # Get the product type specific plugin.
             plugin = self.product_type_plugin(product.core.product_type)
             use_enclosing_directory = plugin.use_enclosing_directory
@@ -593,7 +649,7 @@ class Archive(object):
             else:
                 with util.TemporaryDirectory(prefix=".run_for_product-",
                                              suffix="-%s" % product.core.uuid.hex) as tmp_path:
-                    retrieve_files = remote.retrieve_function(self, product, True)  # TODO verify hash?
+                    retrieve_files = remote.retrieve_function(self, product, True)
                     retrieve_files(tmp_path)
                     paths = [os.path.join(tmp_path, basename) for basename in os.listdir(tmp_path)]
                     return fn(paths)
@@ -1079,7 +1135,7 @@ class Archive(object):
         properties.core.uuid = self.generate_uuid()
         properties.core.active = False
         properties.core.hash = None
-        properties.core.size = util.product_size(paths)  # TODO determine after?
+        properties.core.size = util.product_size(paths)
         properties.core.metadata_date = None
         properties.core.archive_date = None
         properties.core.archive_path = None
@@ -1129,6 +1185,8 @@ class Archive(object):
 
         self.create_properties(properties, disable_hooks=True)
 
+        updated_properties = Struct({'core': {}})
+
         # Try to determine the product hash and ingest the product into the archive.
         try:
             # Determine product hash. Since it is an expensive operation, the hash is computed after inserting the
@@ -1136,24 +1194,26 @@ class Archive(object):
             hash_type = self._plugin_hash_type(plugin)
             if hash_type is not None:
                 try:
-                    properties.core.hash = util.product_hash(paths, hash_type=hash_type)
+                    updated_properties.core.hash = util.product_hash(paths, hash_type=hash_type)
                 except EnvironmentError as _error:
                     raise Error("cannot determine product hash [%s]" % (_error,))
-                self.update_properties(Struct({'core': {'hash': properties.core.hash}}), properties.core.uuid)
 
+            properties.update(updated_properties)
             if ingest_product:
                 use_enclosing_directory = plugin.use_enclosing_directory
                 self._storage.put(paths, properties, use_enclosing_directory, use_symlinks)
-                properties.core.archive_date = self._database.server_time_utc()
+                updated_properties.core.archive_date = self._database.server_time_utc()
 
             elif self._storage is None:
                 if len(paths) == 1:
-                    properties.core.remote_url = 'file://' + os.path.realpath(paths[0])
+                    updated_properties.core.remote_url = 'file://' + os.path.realpath(paths[0])
                 else:
-                    properties.core.remote_url = 'file://' + os.path.realpath(os.path.dirname(paths[0]))  # TODO test
-                properties.core.remote_url = properties.core.remote_url.replace('\\', '/')
-                self.update_properties(Struct({'core': {'remote_url': properties.core.remote_url}}),
-                                       properties.core.uuid)
+                    parent_path = os.path.dirname(paths[0])
+                    for path in paths:
+                        if os.path.dirname(path) != parent_path:
+                            raise Error("all paths need to have the same parent directory")
+                    updated_properties.core.remote_url = 'file://' + os.path.realpath(os.path.dirname(paths[0]))
+                updated_properties.core.remote_url = updated_properties.core.remote_url.replace('\\', '/')
 
         except Exception as e:
             if not (isinstance(e, StorageError) and e.anything_stored):
@@ -1164,15 +1224,12 @@ class Archive(object):
             else:
                 raise
 
-        # Update archive date and activate product
-        properties.core.active = True
-        metadata = {
-            'active': properties.core.active,
-            'archive_date': properties.core.archive_date,
-        }
-        self.update_properties(Struct({'core': metadata}), properties.core.uuid)
+        # Set additional properties and activate product
+        updated_properties.core.active = True
+        self.update_properties(updated_properties, properties.core.uuid)
+        properties.update(updated_properties)
 
-        # Set product tags.
+        # Set product tags
         self._database.tag(properties.core.uuid, tags)
 
         # Verify product hash after copy
@@ -1660,6 +1717,19 @@ class Archive(object):
         """
         return self._database.summary(where, parameters, aggregates, group_by, group_by_tag, having, order_by)
 
+    def sync(self, synchronizer, product_types=None, start=None, end=None, force=False):
+        """Synchronize the archive product catalogue using a synchronizer plugin.
+
+        Arguments:
+        synchronizer -- The synchronizer plugin
+        product_types -- Product types to be synchronized
+        start -- Start datetime of synchronization range (exclusive)
+        end -- End datetime of synchronization range (exclusive)
+        force
+        """
+        synchronizer = self.synchronizer(synchronizer)
+        synchronizer.sync(self, product_types, start, end, force)
+
     def tag(self, where=None, tags=None, parameters={}):
         """Set one or more tags on one or more product(s).
 
@@ -1770,4 +1840,4 @@ class Archive(object):
             if not self._verify_hash(product):
                 failed_products.append(product.core.uuid)
 
-        return failed_products  # TODO different type of return value when single product passed?
+        return failed_products

{muninn-6.4.2 → muninn-7.0}/muninn/config.py

@@ -1,12 +1,12 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function
 
 from muninn._compat import string_types as basestring
 
-from muninn.schema import *
+from muninn.schema import prefix_message_with_path, join
 from muninn.exceptions import InternalError
 from muninn.visitor import TypeVisitor
 

{muninn-6.4.2 → muninn-7.0}/muninn/core.py

@@ -1,14 +1,13 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function
 
 import os
 
-from muninn.schema import *
+from muninn.schema import Mapping, Boolean, Geometry, Long, Text, Timestamp, UUID
 from muninn.util import split_path
-from muninn.remote import *
 
 
 class ArchivePath(Text):

muninn-7.0/muninn/database/__init__.py

@@ -0,0 +1,3 @@
+#
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
+#

muninn-7.0/muninn/database/base.py

@@ -0,0 +1,6 @@
+#
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
+#
+
+class DatabaseBackend(object):
+    pass

{muninn-6.4.2 → muninn-7.0}/muninn/database/blobgeometry.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function
@@ -8,8 +8,8 @@ import sys
 import struct
 
 from muninn.enum import Enum
-from muninn.exceptions import *
-from muninn.geometry import *
+from muninn.exceptions import Error
+from muninn.geometry import LinearRing, LineString, MultiLineString, MultiPoint, MultiPolygon, Point, Polygon
 from muninn.visitor import Visitor
 
 

{muninn-6.4.2 → muninn-7.0}/muninn/database/ewkb.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function
@@ -8,8 +8,8 @@ import codecs
 import struct
 
 from muninn.enum import Enum
-from muninn.exceptions import *
-from muninn.geometry import *
+from muninn.exceptions import Error
+from muninn.geometry import LinearRing, LineString, MultiLineString, MultiPoint, MultiPolygon, Point, Polygon
 from muninn.visitor import Visitor
 
 

{muninn-6.4.2 → muninn-7.0}/muninn/database/postgresql.py

@@ -1,10 +1,11 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function
 
 import re
+import datetime
 import functools
 import inspect
 import json
@@ -29,9 +30,9 @@ import muninn.database.sql as sql
 import muninn.database.ewkb as ewkb
 import muninn.geometry as geometry
 
-from muninn.exceptions import *
+from muninn.exceptions import Error, InternalError
 from muninn.function import Prototype
-from muninn.schema import *
+from muninn.schema import Mapping, Namespace, Boolean, Geometry, Integer, JSON, Long, Real, Text, Timestamp, UUID
 from muninn.struct import Struct
 
 from muninn._compat import dictkeys, dictvalues, is_python2_unicode

{muninn-6.4.2 → muninn-7.0}/muninn/database/sql.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function
@@ -13,10 +13,10 @@ except ImportError:
 
 import inspect
 
-from muninn.exceptions import *
+from muninn.exceptions import Error
 from muninn.function import Prototype
 from muninn.language import parse_and_analyze, Literal, Name, Identifier
-from muninn.schema import *
+from muninn.schema import Boolean, Integer, Long, Real, Sequence, Text, Timestamp, UUID
 from muninn.visitor import Visitor
 from muninn.core import Basename, ArchivePath
 

{muninn-6.4.2 → muninn-7.0}/muninn/database/sqlite.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function
@@ -11,8 +11,6 @@ import functools
 import json
 import uuid
 
-from .base import DatabaseBackend
-
 from muninn._compat import decode, dictkeys, dictvalues, utcnow
 
 # Select a version of dbapi2 that's available.
@@ -24,14 +22,16 @@ try:
 except ImportError:
     import sqlite3.dbapi2 as dbapi2
 
+from .base import DatabaseBackend
+
 import muninn.config as config
 import muninn.database.sql as sql
 import muninn.database.blobgeometry as blobgeometry
 import muninn.geometry as geometry
 
-from muninn.exceptions import *
+from muninn.exceptions import Error, InternalError
 from muninn.function import Prototype
-from muninn.schema import *
+from muninn.schema import Mapping, Namespace, Boolean, Geometry, Integer, JSON, Long, Real, Text, Timestamp, UUID
 from muninn.struct import Struct
 
 
@@ -39,8 +39,8 @@ class _SQLiteConfig(Mapping):
     _alias = "sqlite"
 
     connection_string = Text
-    mod_spatialite_path = optional(Text)
-    table_prefix = optional(Text)
+    mod_spatialite_path = Text(optional=True)
+    table_prefix = Text(optional=True)
 
 
 def create(configuration):
@@ -224,7 +224,7 @@ class SQLiteConnection(object):
         return self._connection.cursor()
 
 
-class SQLiteBackend(object):
+class SQLiteBackend(DatabaseBackend):
     def __init__(self, connection_string="", mod_spatialite_path="mod_spatialite", table_prefix=""):
         dbapi2.register_converter("BOOLEAN", lambda x: bool(int(x)))
         dbapi2.register_adapter(bool, lambda x: int(x))

{muninn-6.4.2 → muninn-7.0}/muninn/enum.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function

{muninn-6.4.2 → muninn-7.0}/muninn/exceptions.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function

{muninn-6.4.2 → muninn-7.0}/muninn/extension.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function

{muninn-6.4.2 → muninn-7.0}/muninn/function.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function

{muninn-6.4.2 → muninn-7.0}/muninn/geometry.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function

{muninn-6.4.2 → muninn-7.0}/muninn/language.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function
@@ -14,9 +14,9 @@ import uuid
 import muninn.geometry as geometry
 
 from muninn.enum import Enum
-from muninn.exceptions import *
+from muninn.exceptions import Error, InternalError
 from muninn.function import Prototype, FunctionTable
-from muninn.schema import *
+from muninn.schema import Namespace, Boolean, Geometry, Integer, Long, Real, Sequence, Text, Timestamp, UUID
 from muninn.visitor import Visitor
 
 

{muninn-6.4.2 → muninn-7.0}/muninn/remote.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 from __future__ import absolute_import, division, print_function
 
@@ -41,10 +41,14 @@ def download_http_oath2(url, target_dir, credentials, timeout, retries):
 
     assert credentials['grant_type'] == "ResourceOwnerPasswordCredentialsGrant"
 
+    auth_args = {}
+    if 'auth_args' in credentials:
+        auth_args = credentials['auth_args']
+
     session = OAuth2Session(client=LegacyApplicationClient(client_id=credentials['client_id']))
     session.fetch_token(token_url=credentials['token_url'], username=credentials['username'],
                         password=credentials['password'], client_id=credentials['client_id'],
-                        client_secret=credentials['client_secret'])
+                        client_secret=credentials['client_secret'], timeout=timeout, **auth_args)
     try:
         while True:
             try:
@@ -258,6 +262,8 @@ class RemoteBackend(object):
 class FileBackend(RemoteBackend):
     def pull(self, archive, product, target_dir):
         source_path = urlparse(product.core.remote_url).path
+        if not os.path.exists(source_path):
+            raise DownloadError("%s does not exist" % product.core.remote_url)
         target_path = os.path.join(target_dir, os.path.basename(source_path))
         util.copy_path(source_path, target_path)
         return self.auto_extract(target_path, product)

{muninn-6.4.2 → muninn-7.0}/muninn/schema.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function

{muninn-6.4.2 → muninn-7.0}/muninn/struct.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function

muninn-7.0/muninn/tools/__init__.py

@@ -0,0 +1,3 @@
+#
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
+#

{muninn-6.4.2 → muninn-7.0}/muninn/tools/attach.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function

{muninn-6.4.2 → muninn-7.0}/muninn/tools/destroy.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function

{muninn-6.4.2 → muninn-7.0}/muninn/tools/export.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function

{muninn-6.4.2 → muninn-7.0}/muninn/tools/hash.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function

{muninn-6.4.2 → muninn-7.0}/muninn/tools/info.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function
@@ -12,11 +12,15 @@ from muninn.tools.utils import create_parser, parse_args_and_run
 def run(args):
     archive_names = args.archive or muninn.list_archives()
 
-    print("ARCHIVES", end='')
-    for archive_name in archive_names:
-        print("\n  " + archive_name)
+    print("ARCHIVES")
+    for index, archive_name in enumerate(sorted(archive_names)):
+        if index > 0 and not args.name_only:
+            print()
+        print("  " + archive_name)
         try:
             with muninn.open(archive_name) as archive:
+                if args.name_only:
+                    continue
                 print("    NAMESPACES")
                 for namespace in sorted(archive.namespaces()):
                     print("      %s" % namespace)
@@ -37,6 +41,11 @@ def run(args):
                     print("\n    REMOTE BACKENDS")
                     for remote_backend in sorted(archive.remote_backends()):
                         print("      %s" % remote_backend)
+
+                if archive.synchronizers():
+                    print("\n    SYNCHRONIZERS")
+                    for synchronizer in sorted(archive.synchronizers()):
+                        print("      %s" % synchronizer)
         except Exception:
             print('    (could not open archive)')
 
@@ -45,7 +54,10 @@ def run(args):
 
 def main():
     parser = create_parser(description="Display generic archive information")
-    parser.add_argument("archive", nargs='*', metavar="ARCHIVE", help="archive identifier (default: search archives)")
+    parser.add_argument("-n", "--name-only", action="store_true",
+                        help="only show archive name")
+    parser.add_argument("archive", nargs='*', metavar="ARCHIVE",
+                        help="archive identifier (default: search and show all archives)")
     return parse_args_and_run(parser, run)
 
 

{muninn-6.4.2 → muninn-7.0}/muninn/tools/ingest.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function

{muninn-6.4.2 → muninn-7.0}/muninn/tools/list_tags.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function

{muninn-6.4.2 → muninn-7.0}/muninn/tools/prepare.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function

{muninn-6.4.2 → muninn-7.0}/muninn/tools/pull.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function

{muninn-6.4.2 → muninn-7.0}/muninn/tools/remove.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function

{muninn-6.4.2 → muninn-7.0}/muninn/tools/retrieve.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function

{muninn-6.4.2 → muninn-7.0}/muninn/tools/search.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function

{muninn-6.4.2 → muninn-7.0}/muninn/tools/strip.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function

{muninn-6.4.2 → muninn-7.0}/muninn/tools/summary.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function

muninn-7.0/muninn/tools/sync.py

@@ -0,0 +1,42 @@
+#
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
+#
+
+from __future__ import absolute_import, division, print_function
+
+import argparse
+from datetime import datetime
+
+import muninn
+
+from muninn.tools.utils import create_parser, parse_args_and_run
+
+
+def valid_date(date: str) -> datetime:
+    date_fmt = '%Y-%m-%d'
+    try:
+        return datetime.strptime(date, date_fmt)
+    except ValueError:
+        raise argparse.ArgumentTypeError(f"invalid date: {date} (expected '{date_fmt}')")
+
+
+def run(args):
+    with muninn.open(args.archive) as archive:
+        archive.sync(args.synchronizer, args.product_types, args.start, args.end, args.force)
+
+
+def main():
+    parser = create_parser(description="Synchronize a muninn archive")
+    parser.add_argument("archive", metavar="ARCHIVE", help="archive identifier")
+    parser.add_argument("synchronizer", help="name of the synchronizer to use")
+    parser.add_argument("-p", "--product-types", nargs="*",
+                        help="the product types to be synchronized")
+    parser.add_argument('--start', type=valid_date, help='start datetime of synchronization range')
+    parser.add_argument('--end', type=valid_date, help='end datetime of synchronization range')
+    parser.add_argument("-f", "--force", action="store_true", default=False,
+                        help="force update, even if entries have not changed")
+    return parse_args_and_run(parser, run)
+
+
+if __name__ == '__main__':
+    main()

{muninn-6.4.2 → muninn-7.0}/muninn/tools/tag.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function

{muninn-6.4.2 → muninn-7.0}/muninn/tools/untag.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function

{muninn-6.4.2 → muninn-7.0}/muninn/tools/update.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function

{muninn-6.4.2 → muninn-7.0}/muninn/tools/utils.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function

{muninn-6.4.2 → muninn-7.0}/muninn/util.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function

{muninn-6.4.2 → muninn-7.0}/muninn/visitor.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
+# Copyright (C) 2014-2025 S[&]T, The Netherlands.
 #
 
 from __future__ import absolute_import, division, print_function

{muninn-6.4.2 → muninn-7.0}/muninn.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: muninn
-Version: 6.4.2
+Version: 7.0
 Summary: Data product catalogue and archive system
 Home-page: https://github.com/stcorp/muninn
 Author: S[&]T

{muninn-6.4.2 → muninn-7.0}/muninn.egg-info/SOURCES.txt

@@ -52,6 +52,7 @@ muninn/tools/retrieve.py
 muninn/tools/search.py
 muninn/tools/strip.py
 muninn/tools/summary.py
+muninn/tools/sync.py
 muninn/tools/tag.py
 muninn/tools/untag.py
 muninn/tools/update.py

{muninn-6.4.2 → muninn-7.0}/muninn.egg-info/entry_points.txt

@@ -13,6 +13,7 @@ muninn-retrieve = muninn.tools.retrieve:main
 muninn-search = muninn.tools.search:main
 muninn-strip = muninn.tools.strip:main
 muninn-summary = muninn.tools.summary:main
+muninn-sync = muninn.tools.sync:main
 muninn-tag = muninn.tools.tag:main
 muninn-untag = muninn.tools.untag:main
 muninn-update = muninn.tools.update:main

{muninn-6.4.2 → muninn-7.0}/setup.py

@@ -15,7 +15,7 @@ requirements = []
 
 setup(
     name="muninn",
-    version="6.4.2",
+    version="7.0",
     description="Data product catalogue and archive system",
     url="https://github.com/stcorp/muninn",
     author="S[&]T",
@@ -36,6 +36,7 @@ setup(
         "muninn-search = muninn.tools.search:main",
         "muninn-strip = muninn.tools.strip:main",
         "muninn-summary = muninn.tools.summary:main",
+        "muninn-sync = muninn.tools.sync:main",
         "muninn-tag = muninn.tools.tag:main",
         "muninn-untag = muninn.tools.untag:main",
         "muninn-update = muninn.tools.update:main",

muninn-6.4.2/muninn/database/__init__.py

@@ -1,3 +0,0 @@
-#
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
-#

muninn-6.4.2/muninn/database/base.py

@@ -1,6 +0,0 @@
-#
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
-#
-
-class DatabaseBackend(object):
-    pass

muninn-6.4.2/muninn/tools/__init__.py

@@ -1,3 +0,0 @@
-#
-# Copyright (C) 2014-2024 S[&]T, The Netherlands.
-#