Remove non-async changes from async PR: revert migration tool path, restore typed signatures and docstrings

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: Abel Milash

pyproject.toml

@@ -40,7 +40,7 @@ dependencies = [
 
 [project.scripts]
 dataverse-install-claude-skill = "PowerPlatform.Dataverse._skill_installer:main"
-dataverse-migrate = "tools.migrate_v0_to_v1:main"
+dataverse-migrate = "PowerPlatform.Dataverse.migration.migrate_v0_to_v1:main"
 
 [project.optional-dependencies]
 async = [
@@ -58,12 +58,12 @@ dev = [
 migration = ["libcst>=1.0.0"]
 
 [tool.setuptools]
-package-dir = {"" = "src", "tools" = "tools"}
+package-dir = {"" = "src"}
 zip-safe = false
 
 [tool.setuptools.packages.find]
-where = ["src", "."]
-include = ["PowerPlatform*", "tools"]
+where = ["src"]
+include = ["PowerPlatform*"]
 namespaces = false
 
 [tool.setuptools.package-data]
@@ -103,10 +103,12 @@ asyncio_mode = "auto"
 
 [tool.coverage.run]
 source = ["src/PowerPlatform"]
-omit = [
-    "*/Dataverse/_skill_installer.py",
-    "*/Dataverse/extensions/__init__.py",
-]
+# Migration codemod is an opt-in tool (requires the [migration] extra).
+# It is exercised by tests/unit/test_migration_tool.py and tests/unit/test_phase4_ga.py,
+# but its CLI plumbing and libcst error-path branches are not meaningfully testable
+# under the default coverage scope. Exclude from coverage reporting so the metric
+# reflects core SDK code only.
+omit = ["src/PowerPlatform/Dataverse/migration/*"]
 
 [tool.coverage.report]
 fail_under = 90

src/PowerPlatform/Dataverse/client.py

@@ -105,7 +105,7 @@ def __init__(
     ) -> None:
         if config is not None and context is not None:
             raise ValueError(
-                "Cannot specify both 'config' and 'context'. " "Pass operation_context via DataverseConfig instead."
+                "Cannot specify both 'config' and 'context'. Pass operation_context via DataverseConfig instead."
             )
         self.auth = _AuthManager(credential)
         self._base_url = (base_url or "").rstrip("/")

src/PowerPlatform/Dataverse/models/record.py

@@ -6,7 +6,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from typing import Any, Dict, Iterator, KeysView, List, Optional, ValuesView, ItemsView
+from typing import Any, Dict, Iterator, KeysView, List, Optional, Union, ValuesView, ItemsView
 
 __all__ = ["Record", "QueryResult"]
 
@@ -141,7 +141,7 @@ def __bool__(self) -> bool:
     def __repr__(self) -> str:
         return f"QueryResult({len(self.records)} records)"
 
-    def __getitem__(self, index):
+    def __getitem__(self, index: Union[int, slice]) -> Union[Record, "QueryResult"]:
         result = self.records[index]
         return QueryResult(result) if isinstance(index, slice) else result
 

src/PowerPlatform/Dataverse/operations/query.py

@@ -33,12 +33,14 @@ class QueryOperations:
 
     Example::
 
+        from PowerPlatform.Dataverse.models.filters import col
+
         client = DataverseClient(base_url, credential)
 
         # Fluent query builder (recommended)
         for record in (client.query.builder("account")
                        .select("name", "revenue")
-                       .filter_eq("statecode", 0)
+                       .where(col("statecode") == 0)
                        .order_by("revenue", descending=True)
                        .top(100)
                        .execute()):
@@ -72,8 +74,8 @@ def builder(self, table: str) -> QueryBuilder:
 
                 for record in (client.query.builder("account")
                                .select("name", "revenue")
-                               .filter_eq("statecode", 0)
-                               .filter_gt("revenue", 1000000)
+                               .where(col("statecode") == 0)
+                               .where(col("revenue") > 1_000_000)
                                .order_by("revenue", descending=True)
                                .top(100)
                                .page_size(50)
@@ -82,11 +84,11 @@ def builder(self, table: str) -> QueryBuilder:
 
             With composable expression tree::
 
-                from PowerPlatform.Dataverse.models.filters import eq, gt
+                from PowerPlatform.Dataverse.models.filters import col
 
                 for record in (client.query.builder("account")
-                               .where((eq("statecode", 0) | eq("statecode", 1))
-                                      & gt("revenue", 100000))
+                               .where((col("statecode") == 0) | (col("statecode") == 1))
+                               .where(col("revenue") > 100_000)
                                .execute()):
                     print(record["name"])
         """

tests/unit/models/test_query_builder.py

@@ -891,6 +891,7 @@ def test_to_dataframe_forwards_count_and_annotations(self):
     def test_to_dataframe_with_record_objects(self):
         """to_dataframe() handles Record objects (with .data attribute)."""
         import pandas as pd
+        from PowerPlatform.Dataverse.models.record import Record
 
         mock_query_ops, _ = self._make_od(
             [

tests/unit/test_phase1_ga.py

@@ -391,6 +391,8 @@ def test_dataframe_get_warning_message(self):
 
     def test_dataframe_other_methods_no_warning(self):
         """dataframe.sql(), dataframe.create(), etc. must NOT warn."""
+        import pandas as pd
+        from PowerPlatform.Dataverse.models.record import Record
 
         self.client._odata._query_sql.return_value = []
 

tests/unit/test_phase3_ga.py

@@ -18,7 +18,7 @@
 import unittest
 import warnings
 from dataclasses import dataclass
-from unittest.mock import MagicMock
+from unittest.mock import MagicMock, patch
 
 from azure.core.credentials import TokenCredential