refactor: apply complexipy refactor suggestions (evaluation demo, do not merge)

airbyte/_connector_base.py

@@ -324,6 +324,13 @@ def connector_version(self) -> str | None:
             # Version not detected, so return None.
             return None
 
+    # TK: C002/loop_guards; complexity 8 -> 7; measured=False.
+    # TK: Suggested replacement: if not msg.type == Type.CONNECTION_STATUS and msg.connectionStatus: continue  # noqa: E501
+    # TK: Rejected; guard 1 is `(not A) and B`, not the complement of
+    # TK: `A and B`, so it misses some non-status messages.
+    # TK: Guard 2 lets FAILED messages continue past the
+    # TK: `AirbyteConnectorCheckFailedError` raise.
+    # TK: Reviewer: confirm this behavior-changing suggestion remains unapplied before merge.
     def check(self) -> None:
         """Call check on the connector.
 

airbyte/_registry_utils.py

@@ -88,7 +88,13 @@ def fetch_registry_version_date(connector_name: str, version: str) -> str | None
 
     Returns the release date string (YYYY-MM-DD) if found, None otherwise.
     """
-    try:  # noqa: PLR1702
+    # TK: C007/collapsible_if; complexity 16 -> 8; measured=True.
+    # TK: Suggested replacement: if version in release_candidates and commit_timestamp and date_match:  # noqa: E501
+    # TK: Applied continue guards for nonmatching repositories and preserved
+    # TK: the matching-connector break.
+    # TK: Reviewer: confirm the for-else, broad debug exception, early return,
+    # TK: and trailing return semantics.
+    try:
         registry_url = "https://connectors.airbyte.com/files/registries/v0/oss_registry.json"
         response = requests.get(registry_url, timeout=10)
         response.raise_for_status()
@@ -98,22 +104,24 @@ def fetch_registry_version_date(connector_name: str, version: str) -> str | None
 
         for connector in connector_list:
             docker_repo = connector.get("dockerRepository", "")
-            if docker_repo == f"airbyte/{connector_name}":
-                releases = connector.get("releases", {})
-                release_candidates = releases.get("releaseCandidates", {})
-
-                if version in release_candidates:
-                    version_data = release_candidates[version]
-                    generated = version_data.get("generated", {})
-                    git_info = generated.get("git", {})
-                    commit_timestamp = git_info.get("commit_timestamp")
-
-                    if commit_timestamp:
-                        date_match = re.match(r"(\d{4}-\d{2}-\d{2})", commit_timestamp)
-                        if date_match:
-                            return date_match.group(1)
-
-                break
+            if docker_repo != f"airbyte/{connector_name}":
+                continue
+
+            releases = connector.get("releases", {})
+            release_candidates = releases.get("releaseCandidates", {})
+
+            if version in release_candidates:
+                version_data = release_candidates[version]
+                generated = version_data.get("generated", {})
+                git_info = generated.get("git", {})
+                commit_timestamp = git_info.get("commit_timestamp")
+
+                if commit_timestamp:
+                    date_match = re.match(r"(\d{4}-\d{2}-\d{2})", commit_timestamp)
+                    if date_match:
+                        return date_match.group(1)
+
+            break
         else:
             return None
     except Exception as e:

airbyte/_util/api_util.py

@@ -181,6 +181,13 @@ def get_web_url_root(api_root: str) -> str:
     return api_root
 
 
+# TK: C005/extract_predicate; complexity 7 -> 5; measured=False.
+# TK: Suggested replacement: def _check_condition_L210() -> bool: return bearer_token is None and (client_id is None or client_secret is None)  # noqa: E501
+# TK: Suggested replacement: def _check_condition_L217() -> bool: return bearer_token is not None and (client_id is not None or client_secret is not None)  # noqa: E501
+# TK: Rejected; line-derived closure names rot, and closures are folded into
+# TK: the parent score.
+# TK: Reviewer: confirm the auth checks remain inline and both authentication
+# TK: branches stay unchanged.
 def get_airbyte_server_instance(
     *,
     api_root: str,

airbyte/secrets/util.py

@@ -110,6 +110,12 @@ def get_secret(
         sources = [sources]  # type: ignore [unreachable]  # This is a 'just in case' catch.
 
     # Replace any SecretSourceEnum strings with the matching SecretManager object
+    # TK: C002/loop_guards; complexity 18 -> 17; measured=False.
+    # TK: Suggested replacement: if not isinstance(source, SecretSourceEnum): continue / if not source not in available_sources: continue  # noqa: E501
+    # TK: Rejected; continue skips the following sources[...] mapping
+    # TK: assignment and breaks resolution.
+    # TK: Reviewer: confirm both guards remain nested so invalid-source
+    # TK: handling and mapping semantics are intact.
     for source in list(sources):
         if isinstance(source, SecretSourceEnum):
             if source not in available_sources:

airbyte/sources/base.py

@@ -64,6 +64,47 @@
 )
 
 
+def _build_sample_table(
+    dataset: InMemoryDataset,
+    *,
+    internal_cols: list[str],
+    col_limit: int,
+) -> Table:
+    """Build a rich table for one stream's sample records."""
+    table = Table(
+        show_header=True,
+        show_lines=True,
+    )
+    if len(dataset.column_names) > col_limit:
+        # We'll pivot the columns so each column is its own row
+        table.add_column("Column Name")
+        for _ in range(len(dataset)):
+            table.add_column(overflow="fold")
+        for col in dataset.column_names:
+            table.add_row(
+                Markdown(f"**`{col}`**"),
+                *[escape(str(record[col])) for record in dataset],
+            )
+    else:
+        for col in dataset.column_names:
+            table.add_column(
+                Markdown(f"**`{col}`**"),
+                overflow="fold",
+            )
+
+        for record in dataset:
+            table.add_row(
+                *[
+                    escape(str(val))
+                    for key, val in record.items()
+                    # Exclude internal Airbyte columns.
+                    if key not in internal_cols
+                ]
+            )
+
+    return table
+
+
 class Source(ConnectorBase):  # noqa: PLR0904
     """A class representing a source that can be called."""
 
@@ -661,6 +702,11 @@ def get_samples(
 
         return results
 
+    # TK: C003/extract_helper; complexity 20 -> 4; measured=False.
+    # TK: Suggested replacement: Extract lines 692-738 into a named helper function.
+    # TK: Applied a module-level table builder; print_samples still prints the same Table.
+    # TK: Reviewer: confirm rendered output remains byte-identical and note
+    # TK: the module total is unchanged.
     def print_samples(
         self,
         streams: list[str] | Literal["*"] | None = None,
@@ -698,43 +744,17 @@ def print_samples(
             )
             dataset = samples[stream]
 
-            table = Table(
-                show_header=True,
-                show_lines=True,
-            )
             if dataset is None:
                 console.print(
                     Markdown("**⚠️ `Error fetching sample records.` ⚠️**"),
                 )
                 continue
 
-            if len(dataset.column_names) > col_limit:
-                # We'll pivot the columns so each column is its own row
-                table.add_column("Column Name")
-                for _ in range(len(dataset)):
-                    table.add_column(overflow="fold")
-                for col in dataset.column_names:
-                    table.add_row(
-                        Markdown(f"**`{col}`**"),
-                        *[escape(str(record[col])) for record in dataset],
-                    )
-            else:
-                for col in dataset.column_names:
-                    table.add_column(
-                        Markdown(f"**`{col}`**"),
-                        overflow="fold",
-                    )
-
-                for record in dataset:
-                    table.add_row(
-                        *[
-                            escape(str(val))
-                            for key, val in record.items()
-                            # Exclude internal Airbyte columns.
-                            if key not in internal_cols
-                        ]
-                    )
-
+            table = _build_sample_table(
+                dataset,
+                internal_cols=internal_cols,
+                col_limit=col_limit,
+            )
             console.print(table)
 
         console.print(Markdown("--------------"))