atdata 0.3.0b1__py3-none-any.whl → 0.3.2b1__py3-none-any.whl

atdata/_sources.py

@@ -64,10 +64,20 @@ class URLSource:
         """Expand brace pattern and return list of shard URLs."""
         return list(braceexpand.braceexpand(self.url))
 
-    # Legacy alias for backwards compatibility
     @property
     def shard_list(self) -> list[str]:
-        """Expand brace pattern and return list of shard URLs (deprecated, use list_shards())."""
+        """Expand brace pattern and return list of shard URLs.
+
+        .. deprecated::
+            Use :meth:`list_shards` instead.
+        """
+        import warnings
+
+        warnings.warn(
+            "shard_list is deprecated, use list_shards()",
+            DeprecationWarning,
+            stacklevel=2,
+        )
         return self.list_shards()
 
     @property
@@ -178,10 +188,20 @@ class S3Source:
         """Return list of S3 URIs for the shards."""
         return [f"s3://{self.bucket}/{key}" for key in self.keys]
 
-    # Legacy alias for backwards compatibility
     @property
     def shard_list(self) -> list[str]:
-        """Return list of S3 URIs for the shards (deprecated, use list_shards())."""
+        """Return list of S3 URIs for the shards.
+
+        .. deprecated::
+            Use :meth:`list_shards` instead.
+        """
+        import warnings
+
+        warnings.warn(
+            "shard_list is deprecated, use list_shards()",
+            DeprecationWarning,
+            stacklevel=2,
+        )
         return self.list_shards()
 
     @property

atdata/_stub_manager.py

@@ -15,7 +15,7 @@ Examples:
     >>> index = Index(auto_stubs=True)
     >>>
     >>> # Modules are generated automatically on decode_schema
-    >>> MyType = index.decode_schema("atdata://local/sampleSchema/MySample@1.0.0")
+    >>> MyType = index.decode_schema("atdata://local/schema/MySample@1.0.0")
     >>> # MyType is now properly typed for IDE autocomplete!
     >>>
     >>> # Get the stub directory path for IDE configuration
@@ -51,8 +51,8 @@ def _extract_authority(schema_ref: Optional[str]) -> str:
     """Extract authority from a schema reference URI.
 
     Args:
-        schema_ref: Schema ref like "atdata://local/sampleSchema/Name@1.0.0"
-            or "atdata://alice.bsky.social/sampleSchema/Name@1.0.0"
+        schema_ref: Schema ref like "atdata://local/schema/Name@1.0.0"
+            or "atdata://alice.bsky.social/schema/Name@1.0.0"
 
     Returns:
         Authority string (e.g., "local", "alice.bsky.social", "did_plc_xxx").
@@ -149,10 +149,6 @@ class StubManager:
         safe_version = version.replace(".", "_")
         return f"{name}_{safe_version}.py"
 
-    def _stub_filename(self, name: str, version: str) -> str:
-        """Alias for _module_filename for backwards compatibility."""
-        return self._module_filename(name, version)
-
     def _module_path(
         self, name: str, version: str, authority: str = DEFAULT_AUTHORITY
     ) -> Path:
@@ -168,12 +164,6 @@ class StubManager:
         """
         return self._stub_dir / authority / self._module_filename(name, version)
 
-    def _stub_path(
-        self, name: str, version: str, authority: str = DEFAULT_AUTHORITY
-    ) -> Path:
-        """Alias for _module_path for backwards compatibility."""
-        return self._module_path(name, version, authority)
-
     def _module_is_current(self, path: Path, version: str) -> bool:
         """Check if an existing module file matches the expected version.
 
@@ -200,10 +190,6 @@ class StubManager:
         except (OSError, IOError):
             return False
 
-    def _stub_is_current(self, path: Path, version: str) -> bool:
-        """Alias for _module_is_current for backwards compatibility."""
-        return self._module_is_current(path, version)
-
     def _ensure_authority_package(self, authority: str) -> None:
         """Ensure authority subdirectory exists with __init__.py."""
         self._ensure_dir_exists()
@@ -261,12 +247,6 @@ class StubManager:
                 pass  # Temp file cleanup failed, re-raising original error
             raise
 
-    def _write_stub_atomic(self, path: Path, content: str) -> None:
-        """Legacy method - extracts authority from path and calls _write_module_atomic."""
-        # Extract authority from path (parent directory name)
-        authority = path.parent.name
-        self._write_module_atomic(path, content, authority)
-
     def ensure_stub(self, schema: dict) -> Optional[Path]:
         """Ensure a module file exists for the given schema.
 
@@ -426,7 +406,7 @@ class StubManager:
         Returns:
             Path if stub exists, None otherwise
         """
-        path = self._stub_path(name, version, authority)
+        path = self._module_path(name, version, authority)
         return path if path.exists() else None
 
     def list_stubs(self, authority: Optional[str] = None) -> list[Path]:
@@ -513,7 +493,7 @@ class StubManager:
         Returns:
             True if file was removed, False if it didn't exist
         """
-        path = self._stub_path(name, version, authority)
+        path = self._module_path(name, version, authority)
         if path.exists():
             try:
                 path.unlink()

atdata/atmosphere/__init__.py

@@ -6,7 +6,7 @@ network.
 
 Key components:
 
-- ``AtmosphereClient``: Authentication and session management for ATProto
+- ``Atmosphere``: Authentication and session management for ATProto
 - ``SchemaPublisher``: Publish PackableSample schemas as ATProto records
 - ``DatasetPublisher``: Publish dataset index records with WebDataset URLs
 - ``LensPublisher``: Publish lens transformation records
@@ -16,13 +16,10 @@ to work unchanged. These features are opt-in for users who want to publish
 or discover datasets on the ATProto network.
 
 Examples:
-    >>> from atdata.atmosphere import AtmosphereClient, SchemaPublisher
+    >>> from atdata.atmosphere import Atmosphere
     >>>
-    >>> client = AtmosphereClient()
-    >>> client.login("handle.bsky.social", "app-password")
-    >>>
-    >>> publisher = SchemaPublisher(client)
-    >>> schema_uri = publisher.publish(MySampleType, version="1.0.0")
+    >>> atmo = Atmosphere.login("handle.bsky.social", "app-password")
+    >>> index = Index(atmosphere=atmo)
 
 Note:
     This module requires the ``atproto`` package to be installed::
@@ -32,16 +29,28 @@ Note:
 
 from typing import Iterator, Optional, Type, TYPE_CHECKING
 
-from .client import AtmosphereClient
+from .client import Atmosphere
 from .schema import SchemaPublisher, SchemaLoader
 from .records import DatasetPublisher, DatasetLoader
 from .lens import LensPublisher, LensLoader
 from .store import PDSBlobStore
-from ._types import (
-    AtUri,
-    SchemaRecord,
-    DatasetRecord,
-    LensRecord,
+from ._types import AtUri, LEXICON_NAMESPACE
+from ._lexicon_types import (
+    LexSchemaRecord,
+    LexDatasetRecord,
+    LexLensRecord,
+    LexCodeReference,
+    JsonSchemaFormat,
+    StorageHttp,
+    StorageS3,
+    StorageBlobs,
+    ShardChecksum,
+    HttpShardEntry,
+    S3ShardEntry,
+    BlobEntry,
+    DatasetSize,
+    StorageUnion,
+    storage_from_record,
 )
 
 if TYPE_CHECKING:
@@ -73,11 +82,23 @@ class AtmosphereIndexEntry:
 
     @property
     def data_urls(self) -> list[str]:
-        """WebDataset URLs from external storage."""
+        """WebDataset URLs from storage.
+
+        Handles storageHttp (shard URLs), storageS3 (s3:// URLs),
+        storageExternal (legacy), and storageBlobs (PDS blob URLs).
+        """
         storage = self._record.get("storage", {})
         storage_type = storage.get("$type", "")
+        if "storageHttp" in storage_type:
+            return [s["url"] for s in storage.get("shards", [])]
+        if "storageS3" in storage_type:
+            bucket = storage.get("bucket", "")
+            return [f"s3://{bucket}/{s['key']}" for s in storage.get("shards", [])]
         if "storageExternal" in storage_type:
             return storage.get("urls", [])
+        if "storageBlobs" in storage_type:
+            # Blob URLs must be resolved via PDS; return empty for now
+            return []
         return []
 
     @property
@@ -122,14 +143,14 @@ class AtmosphereIndex:
 
     def __init__(
         self,
-        client: AtmosphereClient,
+        client: Atmosphere,
         *,
         data_store: Optional[PDSBlobStore] = None,
     ):
         """Initialize the atmosphere index.
 
         Args:
-            client: Authenticated AtmosphereClient instance.
+            client: Authenticated Atmosphere instance.
             data_store: Optional PDSBlobStore for writing shards as blobs.
                 If provided, insert_dataset will upload shards to PDS.
         """
@@ -314,9 +335,13 @@ class AtmosphereIndex:
         return schema_to_type(schema)
 
 
+# Deprecated alias for backward compatibility
+AtmosphereClient = Atmosphere
+
 __all__ = [
     # Client
-    "AtmosphereClient",
+    "Atmosphere",
+    "AtmosphereClient",  # deprecated alias
     # Storage
     "PDSBlobStore",
     # Unified index (AbstractIndex protocol)
@@ -331,9 +356,23 @@ __all__ = [
     # Lens operations
     "LensPublisher",
     "LensLoader",
-    # Types
+    # Core types
     "AtUri",
-    "SchemaRecord",
-    "DatasetRecord",
-    "LensRecord",
+    "LEXICON_NAMESPACE",
+    # Lexicon-mirror types (Tier 1)
+    "LexSchemaRecord",
+    "LexDatasetRecord",
+    "LexLensRecord",
+    "LexCodeReference",
+    "JsonSchemaFormat",
+    "StorageHttp",
+    "StorageS3",
+    "StorageBlobs",
+    "StorageUnion",
+    "storage_from_record",
+    "ShardChecksum",
+    "HttpShardEntry",
+    "S3ShardEntry",
+    "BlobEntry",
+    "DatasetSize",
 ]