Merge commit '4d9d2c0d968d7f3299d74beaa6efc04675fd3bed' into decode-token

Author: DiamondJoseph

.github/workflows/publish-image.yml

@@ -44,6 +44,7 @@ jobs:
 
       - name: Build and push Docker image
         uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
+        if: startsWith(github.ref, 'refs/tags/')
         with:
           context: .
           file: Dockerfile
@@ -56,6 +57,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
         id: install
+        if: startsWith(github.ref, 'refs/tags/')
 
       - name: Log in to the Chart registry
         run: |
@@ -65,4 +67,8 @@ jobs:
         run: |
           helm dependencies update helm/tiled
           helm package helm/tiled --version ${{ steps.meta.outputs.version }} --app-version ${{ steps.meta.outputs.version }} -d /tmp/
+
+      - name: Publish Helm chart
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
           helm push /tmp/tiled-${{ steps.meta.outputs.version }}.tgz oci://ghcr.io/bluesky/charts

CHANGELOG.md

@@ -1,8 +1,20 @@
 <!-- Add the recent changes in the code under the relevant category.
 Write the date in place of the "Unreleased" in the case a new version is released. -->
-
 # Changelog
 
+## Unreleased
+
+### Changed
+
+- Removed pydantic-based definitions of structures, which had duplicated
+  the dataclass-based defintions in order to work around a pydantic bug
+  which has since been resolved. All modules named `tiled.server.pydantic_*`
+  have been removed. These were used internally by the server and should
+  not affect user code.
+- Publish Container image and Helm chart only during a tagged release.
+- Stop warning when `data_sources()` are fetched after the item was already
+  fetched. (Too noisy.)
+
 ## v0.1.0-b17 (2024-01-29)
 
 ### Changed
@@ -24,6 +36,8 @@ Write the date in place of the "Unreleased" in the case a new version is release
 
 - Do not attempt to use auth tokens if the server declares no authentication
   providers.
+- Prevent "incognito mode" (remember_me=False) from failing after a previous
+  login session has since been logged out (no token files)
 
 ### Maintenance
 

tiled/__init__.py

@@ -1 +1,6 @@
-from ._version import __version__, __version_tuple__  # noqa: F401
+from ._version import __version__, __version_tuple__
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+]

tiled/_tests/test_asset_access.py

@@ -35,13 +35,9 @@ def test_include_data_sources_method_on_self(client):
     "Calling include_data_sources() fetches data sources on self."
     x = client.write_array([1, 2, 3], key="x")
     # Fetch data_sources on x object directly.
-    with pytest.warns(UserWarning):
-        # This fetches the sources with an additional implicit request.
-        x.data_sources()
+    x.data_sources() is not None
     # Fetch data_sources on x object, looked up in client.
-    with pytest.warns(UserWarning):
-        # This fetches the sources with an additional implicit request.
-        client["x"].data_sources()
+    client["x"].data_sources() is not None
     assert client["x"].include_data_sources().data_sources() is not None
 
 

tiled/adapters/awkward_directory_container.py

@@ -1,18 +1,9 @@
-import sys
+from collections.abc import Mapping
 from pathlib import Path
 from typing import Any, Iterator
 
-if sys.version_info < (3, 9):
-    from typing_extensions import MutableMapping
 
-    MappingType = MutableMapping
-else:
-    import collections
-
-    MappingType = collections.abc.MutableMapping
-
-
-class DirectoryContainer(MappingType[str, bytes]):
+class DirectoryContainer(Mapping[str, bytes]):
     """ """
 
     def __init__(self, directory: Path, form: Any):

tiled/adapters/hdf5.py

@@ -1,7 +1,6 @@
-import collections.abc
 import os
-import sys
 import warnings
+from collections.abc import Mapping
 from typing import Any, Iterator, List, Optional, Tuple, Union
 
 import h5py
@@ -27,17 +26,7 @@ def from_dataset(dataset: NDArray[Any]) -> ArrayAdapter:
     return ArrayAdapter.from_array(dataset, metadata=getattr(dataset, "attrs", {}))
 
 
-if sys.version_info < (3, 9):
-    from typing_extensions import Mapping
-
-    MappingType = Mapping
-else:
-    import collections
-
-    MappingType = collections.abc.Mapping
-
-
-class HDF5Adapter(MappingType[str, Union["HDF5Adapter", ArrayAdapter]], IndexersMixin):
+class HDF5Adapter(Mapping[str, Union["HDF5Adapter", ArrayAdapter]], IndexersMixin):
     """
     Read an HDF5 file or a group within one.
 

tiled/adapters/mapping.py

@@ -1,8 +1,6 @@
-import collections.abc
 import copy
 import itertools
 import operator
-import sys
 from collections import Counter
 from datetime import datetime, timedelta, timezone
 from typing import (
@@ -20,6 +18,8 @@
 if TYPE_CHECKING:
     from fastapi import APIRouter
 
+from collections.abc import Iterable, Mapping
+
 from ..iterviews import ItemsView, KeysView, ValuesView
 from ..queries import (
     Comparison,
@@ -43,17 +43,8 @@
 from .protocols import AccessPolicy, AnyAdapter
 from .utils import IndexersMixin
 
-if sys.version_info < (3, 9):
-    from typing_extensions import Mapping
-
-    MappingType = Mapping
-else:
-    import collections
-
-    MappingType = collections.abc.Mapping
-
 
-class MapAdapter(MappingType[str, AnyAdapter], IndexersMixin):
+class MapAdapter(Mapping[str, AnyAdapter], IndexersMixin):
     """
     Adapt any mapping (dictionary-like object) to Tiled.
     """
@@ -537,7 +528,7 @@ def walk_string_values(tree: MapAdapter, node: Optional[Any] = None) -> Iterator
         elif hasattr(value, "items"):
             for k, v in value.items():
                 yield from walk_string_values(value, k)
-        elif isinstance(value, collections.abc.Iterable):
+        elif isinstance(value, Iterable):
             for item in value:
                 if isinstance(item, str):
                     yield item
@@ -706,7 +697,7 @@ def contains(query: Any, tree: MapAdapter) -> MapAdapter:
     matches = {}
     for key, value, term in iter_child_metadata(query.key, tree):
         if (
-            isinstance(term, collections.abc.Iterable)
+            isinstance(term, Iterable)
             and (not isinstance(term, str))
             and (query.value in term)
         ):

tiled/adapters/protocols.py

@@ -1,6 +1,5 @@
-import collections.abc
-import sys
 from abc import abstractmethod
+from collections.abc import Mapping
 from typing import Any, Dict, List, Literal, Optional, Protocol, Tuple, Union
 
 import dask.dataframe
@@ -35,17 +34,7 @@ def specs(self) -> List[Spec]:
         pass
 
 
-if sys.version_info < (3, 9):
-    from typing_extensions import Mapping
-
-    MappingType = Mapping
-else:
-    import collections
-
-    MappingType = collections.abc.Mapping
-
-
-class ContainerAdapter(MappingType[str, "AnyAdapter"], BaseAdapter):
+class ContainerAdapter(Mapping[str, "AnyAdapter"], BaseAdapter):
     structure_family: Literal[StructureFamily.container]
 
     @abstractmethod

tiled/adapters/sparse.py

@@ -1,6 +1,6 @@
 from typing import Any, Dict, List, Optional, Tuple, Union
 
-import dask
+import dask.dataframe
 import numpy
 import pandas
 import sparse

tiled/adapters/xarray.py

@@ -1,6 +1,5 @@
-import collections.abc
 import itertools
-import sys
+from collections.abc import Mapping
 from typing import Any, Iterator, List, Optional
 
 import xarray
@@ -82,17 +81,7 @@ def inlined_contents_enabled(self, depth: int) -> bool:
         return True
 
 
-if sys.version_info < (3, 9):
-    from typing_extensions import Mapping
-
-    MappingType = Mapping
-else:
-    import collections
-
-    MappingType = collections.abc.Mapping
-
-
-class _DatasetMap(MappingType[str, Any]):
+class _DatasetMap(Mapping[str, Any]):
     def __init__(self, dataset: Any) -> None:
         """