Revert example script import changes

Abel Milash · claude · Abel Milash · commit 1404b92bf8bf · 2026-05-22T16:43:48.000-07:00
User feedback: the import changes in README.md and SKILL.md are enough.
Example scripts can stay with their original (main) import style.

8 files reverted to main's content:
- examples/advanced/{alternate_keys_upsert,dataframe_operations,datascience_risk_assessment,
  prodev_quick_start,relationships,walkthrough}.py
- examples/basic/{functional_testing,installation_example}.py

Co-Authored-By: Claude Opus 4.7 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/examples/advanced/alternate_keys_upsert.py b/examples/advanced/alternate_keys_upsert.py
@@ -23,7 +23,7 @@
 import time
 
 from PowerPlatform.Dataverse.client import DataverseClient
-from PowerPlatform.Dataverse.models import UpsertItem
+from PowerPlatform.Dataverse.models.upsert import UpsertItem
 from azure.identity import InteractiveBrowserCredential  # type: ignore
 
 # --- Config ---
diff --git a/examples/advanced/dataframe_operations.py b/examples/advanced/dataframe_operations.py
@@ -19,7 +19,7 @@
 from azure.identity import InteractiveBrowserCredential
 
 from PowerPlatform.Dataverse.client import DataverseClient
-from PowerPlatform.Dataverse.models import col, raw
+from PowerPlatform.Dataverse.models.filters import col, raw
 
 
 def main():
diff --git a/examples/advanced/datascience_risk_assessment.py b/examples/advanced/datascience_risk_assessment.py
@@ -50,7 +50,7 @@
 from azure.identity import InteractiveBrowserCredential
 
 from PowerPlatform.Dataverse.client import DataverseClient
-from PowerPlatform.Dataverse.models import col, raw
+from PowerPlatform.Dataverse.models.filters import col, raw
 
 # -- Optional imports (graceful degradation if not installed) ------
 
diff --git a/examples/advanced/prodev_quick_start.py b/examples/advanced/prodev_quick_start.py
@@ -56,7 +56,7 @@
 from azure.identity import InteractiveBrowserCredential
 
 from PowerPlatform.Dataverse.client import DataverseClient
-from PowerPlatform.Dataverse.models import col
+from PowerPlatform.Dataverse.models.filters import col
 
 # -- Table schema names --
 # Uses the standard 'new_' publisher prefix (default Dataverse publisher).
diff --git a/examples/advanced/relationships.py b/examples/advanced/relationships.py
@@ -20,14 +20,13 @@
 import time
 from azure.identity import InteractiveBrowserCredential
 from PowerPlatform.Dataverse.client import DataverseClient
-from PowerPlatform.Dataverse.models import (
-    CascadeConfiguration,
-    Label,
-    LocalizedLabel,
+from PowerPlatform.Dataverse.models.relationship import (
     LookupAttributeMetadata,
-    ManyToManyRelationshipMetadata,
     OneToManyRelationshipMetadata,
+    ManyToManyRelationshipMetadata,
+    CascadeConfiguration,
 )
+from PowerPlatform.Dataverse.models.labels import Label, LocalizedLabel
 from PowerPlatform.Dataverse.common.constants import (
     CASCADE_BEHAVIOR_NO_CASCADE,
     CASCADE_BEHAVIOR_REMOVE_LINK,
diff --git a/examples/advanced/walkthrough.py b/examples/advanced/walkthrough.py
@@ -26,7 +26,8 @@
 from azure.identity import InteractiveBrowserCredential
 from PowerPlatform.Dataverse.client import DataverseClient
 from PowerPlatform.Dataverse.core.errors import MetadataError
-from PowerPlatform.Dataverse.models import ExpandOption, col
+from PowerPlatform.Dataverse.models.filters import col
+from PowerPlatform.Dataverse.models.query_builder import ExpandOption
 import requests
 
 
diff --git a/examples/basic/functional_testing.py b/examples/basic/functional_testing.py
@@ -34,19 +34,18 @@
 # Import SDK components (assumes installation is already validated)
 from PowerPlatform.Dataverse.client import DataverseClient
 from PowerPlatform.Dataverse.core.errors import HttpError, MetadataError
-from PowerPlatform.Dataverse.models import (
-    CascadeConfiguration,
-    Label,
-    LocalizedLabel,
+from PowerPlatform.Dataverse.models.relationship import (
     LookupAttributeMetadata,
-    ManyToManyRelationshipMetadata,
     OneToManyRelationshipMetadata,
-    UpsertItem,
+    ManyToManyRelationshipMetadata,
+    CascadeConfiguration,
 )
+from PowerPlatform.Dataverse.models.labels import Label, LocalizedLabel
 from PowerPlatform.Dataverse.common.constants import (
     CASCADE_BEHAVIOR_NO_CASCADE,
     CASCADE_BEHAVIOR_REMOVE_LINK,
 )
+from PowerPlatform.Dataverse.models.upsert import UpsertItem
 from azure.identity import InteractiveBrowserCredential
 
 
diff --git a/examples/basic/installation_example.py b/examples/basic/installation_example.py
@@ -60,7 +60,10 @@
 from typing import Optional
 from datetime import datetime
 
-from PowerPlatform.Dataverse.operations import FileOperations, QueryOperations, RecordOperations, TableOperations
+from PowerPlatform.Dataverse.operations.records import RecordOperations
+from PowerPlatform.Dataverse.operations.query import QueryOperations
+from PowerPlatform.Dataverse.operations.tables import TableOperations
+from PowerPlatform.Dataverse.operations.files import FileOperations
 
 
 def validate_imports():
@@ -82,7 +85,7 @@ def validate_imports():
 
         print(f"  [OK] Core errors: HttpError, MetadataError")
 
-        from PowerPlatform.Dataverse.core import DataverseConfig
+        from PowerPlatform.Dataverse.core.config import DataverseConfig
 
         print(f"  [OK] Core config: DataverseConfig")
 
diff --git a/src/PowerPlatform/Dataverse/__init__.py b/src/PowerPlatform/Dataverse/__init__.py
@@ -3,21 +3,10 @@
 
 from importlib.metadata import version
 
-# Set __version__ FIRST. Downstream modules (e.g. data/_odata_base.py) import
-# this back from the top-level package, so it must be bound before any
-# transitive import of those modules runs.
-__version__ = version("PowerPlatform-Dataverse-Client")
-
-from .client import DataverseClient
 from .models.filters import col, raw
 from .models.protocol import DataverseModel
 from .models.record import QueryResult
 
-__all__ = [
-    "DataverseClient",
-    "DataverseModel",
-    "QueryResult",
-    "__version__",
-    "col",
-    "raw",
-]
+__version__ = version("PowerPlatform-Dataverse-Client")
+
+__all__ = ["__version__", "col", "raw", "DataverseModel", "QueryResult"]
diff --git a/src/PowerPlatform/Dataverse/claude_skill/dataverse-sdk-use/SKILL.md b/src/PowerPlatform/Dataverse/claude_skill/dataverse-sdk-use/SKILL.md
@@ -212,7 +212,7 @@ client.records.update("account", [id1, id2, id3], {"industry": "Technology"})
 Creates or updates records identified by alternate keys. Single item -> PATCH; multiple items -> `UpsertMultiple` bulk action.
 > **Prerequisite**: The table must have an alternate key configured in Dataverse for the columns used in `alternate_key`. Without it, Dataverse will reject the request with a 400 error.
 ```python
-from PowerPlatform.Dataverse.models import UpsertItem
+from PowerPlatform.Dataverse.models.upsert import UpsertItem
 
 # Single upsert
 client.records.upsert("account", [
@@ -403,12 +403,12 @@ client.tables.delete("new_Product")
 
 #### Create One-to-Many Relationship
 ```python
-from PowerPlatform.Dataverse.models import (
-    CascadeConfiguration,
-    Label,
-    LocalizedLabel,
+from PowerPlatform.Dataverse.models.relationship import (
     LookupAttributeMetadata,
     OneToManyRelationshipMetadata,
+    Label,
+    LocalizedLabel,
+    CascadeConfiguration,
 )
 from PowerPlatform.Dataverse.common.constants import CASCADE_BEHAVIOR_REMOVE_LINK
 
@@ -435,7 +435,7 @@ print(f"Created lookup field: {result['lookup_schema_name']}")
 
 #### Create Many-to-Many Relationship
 ```python
-from PowerPlatform.Dataverse.models import ManyToManyRelationshipMetadata
+from PowerPlatform.Dataverse.models.relationship import ManyToManyRelationshipMetadata
 
 relationship = ManyToManyRelationshipMetadata(
     schema_name="new_employee_project",
@@ -535,9 +535,9 @@ The SDK provides structured exceptions with detailed error information:
 from PowerPlatform.Dataverse.core.errors import (
     DataverseError,
     HttpError,
-    MetadataError,
-    SQLParseError,
     ValidationError,
+    MetadataError,
+    SQLParseError
 )
 from PowerPlatform.Dataverse.client import DataverseClient
 
diff --git a/src/PowerPlatform/Dataverse/client.py b/src/PowerPlatform/Dataverse/client.py
@@ -27,7 +27,7 @@ class DataverseClient:
 
     This client provides a simple, stable interface for interacting with Dataverse environments
     through the Web API. It handles authentication via Azure Identity and delegates HTTP operations
-    to an internal OData client.
+    to an internal :class:`~PowerPlatform.Dataverse.data._odata._ODataClient`.
 
     Key capabilities:
         - OData CRUD operations: create, read, update, delete records
diff --git a/src/PowerPlatform/Dataverse/core/__init__.py b/src/PowerPlatform/Dataverse/core/__init__.py
@@ -8,17 +8,4 @@
 configuration, HTTP client, and error handling.
 """
 
-from .config import DataverseConfig, OperationContext
-from .errors import DataverseError, HttpError, MetadataError, SQLParseError, ValidationError
-from .log_config import LogConfig
-
-__all__ = [
-    "DataverseConfig",
-    "DataverseError",
-    "HttpError",
-    "LogConfig",
-    "MetadataError",
-    "OperationContext",
-    "SQLParseError",
-    "ValidationError",
-]
+__all__ = []
diff --git a/src/PowerPlatform/Dataverse/core/config.py b/src/PowerPlatform/Dataverse/core/config.py
@@ -18,8 +18,6 @@
 if TYPE_CHECKING:
     from .log_config import LogConfig
 
-__all__ = ["DataverseConfig", "OperationContext"]
-
 # key=value pairs separated by semicolons.
 # Keys: alphanumeric, hyphens, underscores.
 # Values: alphanumeric, hyphens, underscores, dots, slashes.
diff --git a/src/PowerPlatform/Dataverse/models/__init__.py b/src/PowerPlatform/Dataverse/models/__init__.py
@@ -7,56 +7,19 @@
 Provides dataclasses and helpers for Dataverse entities:
 
 - :class:`~PowerPlatform.Dataverse.models.query_builder.QueryBuilder`: Fluent query builder.
-- :mod:`~PowerPlatform.Dataverse.models.filters`: Composable OData filter expressions
-  via :func:`~PowerPlatform.Dataverse.models.filters.col` and
-  :func:`~PowerPlatform.Dataverse.models.filters.raw`.
+- :mod:`~PowerPlatform.Dataverse.models.filters`: Composable OData filter expressions.
 - :class:`~PowerPlatform.Dataverse.models.record.QueryResult`: Iterable result wrapper.
-- :class:`~PowerPlatform.Dataverse.models.record.Record`: Dataverse entity record.
 - :class:`~PowerPlatform.Dataverse.models.upsert.UpsertItem`: Upsert operation item.
-- :class:`~PowerPlatform.Dataverse.models.fetchxml_query.FetchXmlQuery`: FetchXML query object.
-- :class:`~PowerPlatform.Dataverse.models.protocol.DataverseModel`: Typed-model protocol.
+
+Import directly from the specific module, e.g.::
+
+    from PowerPlatform.Dataverse.models.query_builder import QueryBuilder
+    from PowerPlatform.Dataverse.models.filters import col, raw
+    from PowerPlatform.Dataverse.models.record import QueryResult
 """
 
-from .batch import BatchItemResponse, BatchResult
-from .fetchxml_query import FetchXmlQuery
-from .filters import ColumnProxy, FilterExpression, col, raw
-from .labels import Label, LocalizedLabel
+from .filters import col, raw
 from .protocol import DataverseModel
-from .query_builder import ExpandOption, QueryBuilder, QueryParams
-from .record import QueryResult, Record
-from .relationship import (
-    CascadeConfiguration,
-    LookupAttributeMetadata,
-    ManyToManyRelationshipMetadata,
-    OneToManyRelationshipMetadata,
-    RelationshipInfo,
-)
-from .table_info import AlternateKeyInfo, ColumnInfo, TableInfo
-from .upsert import UpsertItem
+from .record import QueryResult
 
-__all__ = [
-    "AlternateKeyInfo",
-    "BatchItemResponse",
-    "BatchResult",
-    "CascadeConfiguration",
-    "ColumnInfo",
-    "ColumnProxy",
-    "DataverseModel",
-    "ExpandOption",
-    "FetchXmlQuery",
-    "FilterExpression",
-    "Label",
-    "LocalizedLabel",
-    "LookupAttributeMetadata",
-    "ManyToManyRelationshipMetadata",
-    "OneToManyRelationshipMetadata",
-    "QueryBuilder",
-    "QueryParams",
-    "QueryResult",
-    "Record",
-    "RelationshipInfo",
-    "TableInfo",
-    "UpsertItem",
-    "col",
-    "raw",
-]
+__all__ = ["col", "raw", "DataverseModel", "QueryResult"]
diff --git a/src/PowerPlatform/Dataverse/models/fetchxml_query.py b/src/PowerPlatform/Dataverse/models/fetchxml_query.py
@@ -52,7 +52,7 @@ def __init__(self, xml: str, entity_name: str, client: "DataverseClient") -> Non
         self._client = client
 
     def execute(self) -> QueryResult:
-        """Execute the FetchXML query and return all results as a :class:`~PowerPlatform.Dataverse.models.record.QueryResult`.
+        """Execute the FetchXML query and return all results as a :class:`QueryResult`.
 
         Blocking — fetches all pages upfront and holds every record in memory before
         returning. Simple for small-to-medium result sets; use :meth:`execute_pages`
@@ -72,7 +72,7 @@ def execute(self) -> QueryResult:
         return QueryResult(all_records)
 
     def execute_pages(self) -> Iterator[QueryResult]:
-        """Lazily yield one :class:`~PowerPlatform.Dataverse.models.record.QueryResult` per HTTP page.
+        """Lazily yield one :class:`QueryResult` per HTTP page.
 
         Streaming — each iteration fires one HTTP request and yields one page.
         Prefer over :meth:`execute` when:
@@ -84,7 +84,7 @@ def execute_pages(self) -> Iterator[QueryResult]:
 
         One-shot — do not iterate more than once.
 
-        :return: Iterator of per-page :class:`~PowerPlatform.Dataverse.models.record.QueryResult` objects.
+        :return: Iterator of per-page :class:`QueryResult` objects.
         :rtype: Iterator[:class:`~PowerPlatform.Dataverse.models.record.QueryResult`]
 
         Example::
diff --git a/src/PowerPlatform/Dataverse/models/query_builder.py b/src/PowerPlatform/Dataverse/models/query_builder.py
diff --git a/src/PowerPlatform/Dataverse/operations/__init__.py b/src/PowerPlatform/Dataverse/operations/__init__.py
diff --git a/src/PowerPlatform/Dataverse/operations/batch.py b/src/PowerPlatform/Dataverse/operations/batch.py
diff --git a/src/PowerPlatform/Dataverse/operations/records.py b/src/PowerPlatform/Dataverse/operations/records.py
diff --git a/src/PowerPlatform/Dataverse/operations/tables.py b/src/PowerPlatform/Dataverse/operations/tables.py
