Merge branch 'main' into release/2.3.0

Author: aarthy-dk

.pre-commit-config.yaml

@@ -5,29 +5,29 @@ repos:
     rev: v0.4.3
     hooks:
       - id: ruff
-        args: [ --fix, --exit-non-zero-on-fix, --show-fixes ]
+        args: [format, --diff]
       - id: ruff-format
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0
     hooks:
-    - id: end-of-file-fixer
-      exclude_types: ["json"]
-    - id: trailing-whitespace
-      exclude_types: ["json"]
+      - id: end-of-file-fixer
+        exclude_types: ["json"]
+      - id: trailing-whitespace
+        exclude_types: ["json"]
 
   - repo: local
     hooks:
-    - id: check-tests-are-marked
-      alias: check-tests-are-marked
-      name: check-tests-are-marked
-      entry: scripts/check-tests-are-marked.py
-      language: python
-      types: ["python"]
-      files: "tests"
-      exclude: "/conftest.py$"
-    - id: check-docker-file-extension
-      alias: docker-filename
-      name: check-docker-file-extension
-      entry: scripts/check-docker-extensions.py
-      language: python
+      - id: check-tests-are-marked
+        alias: check-tests-are-marked
+        name: check-tests-are-marked
+        entry: scripts/check-tests-are-marked.py
+        language: python
+        types: ["python"]
+        files: "tests"
+        exclude: "/conftest.py$"
+      - id: check-docker-file-extension
+        alias: docker-filename
+        name: check-docker-file-extension
+        entry: scripts/check-docker-extensions.py
+        language: python

README.md

@@ -1,5 +1,5 @@
-# DataOps Observability 
-![apache 2.0 license Badge](https://img.shields.io/badge/License%20-%20Apache%202.0%20-%20blue) ![PRs Badge](https://img.shields.io/badge/PRs%20-%20Welcome%20-%20green) [![Docker Pulls](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fhub.docker.com%2Fv2%2Frepositories%2Fdatakitchen%2Fdataops-testgen%2F&query=pull_count&style=flat&label=docker%20pulls&color=06A04A)](https://hub.docker.com/r/datakitchen/dataops-observability) [![Documentation](https://img.shields.io/badge/docs-On%20datakitchen.io-06A04A?style=flat)](https://docs.datakitchen.io/articles/#!dataops-observability-help/dataops-observability-help) 
+# DataOps Observability
+![apache 2.0 license Badge](https://img.shields.io/badge/License%20-%20Apache%202.0%20-%20blue) ![PRs Badge](https://img.shields.io/badge/PRs%20-%20Welcome%20-%20green) [![Docker Pulls](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fhub.docker.com%2Fv2%2Frepositories%2Fdatakitchen%2Fdataops-testgen%2F&query=pull_count&style=flat&label=docker%20pulls&color=06A04A)](https://hub.docker.com/r/datakitchen/dataops-observability) [![Documentation](https://img.shields.io/badge/docs-On%20datakitchen.io-06A04A?style=flat)](https://docs.datakitchen.io/articles/#!dataops-observability-help/dataops-observability-help)
 [![Latest Version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fhub.docker.com%2Fv2%2Frepositories%2Fdatakitchen%2Fdataops-observability-be%2Ftags%2F&query=results%5B0%5D.name&label=latest%20version&color=06A04A)](https://hub.docker.com/r/datakitchen/dataops-observability-be)
 [![Static Badge](https://img.shields.io/badge/Slack-Join%20Discussion-blue?style=flat&logo=slack)](https://data-observability-slack.datakitchen.io/join)
 
@@ -152,7 +152,7 @@ We recommend you start by going through the [Data Observability Overview Demo](h
 For support requests, [join the Data Observability Slack](https://data-observability-slack.datakitchen.io/join) and ask post on #support channel.
 
 ### Connect
-Talk and Learn with other data practitioners who are building with DataKitchen. Share knowledge, get help, and contribute to our open-source project. 
+Talk and Learn with other data practitioners who are building with DataKitchen. Share knowledge, get help, and contribute to our open-source project.
 
 Join our community here:
 

agent_api/routes/v1_routes.py

@@ -1,6 +1,6 @@
 __all__ = ("build_v1_routes",)
 
-from typing import Callable
+from collections.abc import Callable
 
 from flask import Blueprint, Flask
 

cli/__init__.py

@@ -12,7 +12,6 @@ def get_version(name: str = "cli") -> str:
     By default, get_version() always returns the vermin version but the **name** keyword
     argument can be passed to get version info for any installed package.
     """
-
     try:
         return version(name)
     except PackageNotFoundError:

cli/base.py

@@ -4,7 +4,8 @@
 from argparse import ArgumentParser
 from logging.config import dictConfig
 from pathlib import Path
-from typing import Any, Callable, Optional
+from typing import Any, Optional
+from collections.abc import Callable
 
 from log_color import ColorFormatter, ColorStripper
 

cli/entry_points/database_schema.py

@@ -1,6 +1,8 @@
 import re
 from argparse import ArgumentParser
-from typing import Any, Iterable, Optional, Pattern
+from typing import Any, Optional
+from re import Pattern
+from collections.abc import Iterable
 
 from peewee import MySQLDatabase
 

cli/entry_points/gen_events.py

@@ -7,7 +7,8 @@
 import time
 from argparse import Action, ArgumentParser, Namespace
 from datetime import datetime
-from typing import Any, Optional, Sequence, Type, Union
+from typing import Any, Optional, Union
+from collections.abc import Sequence
 
 from requests_extensions import get_session
 
@@ -82,7 +83,7 @@ class RunStatusEvent(BaseEvent):
 }
 
 
-def make_events_action(event_id: str) -> Type[Action]:
+def make_events_action(event_id: str) -> type[Action]:
     class EventsAction(Action):
         def __call__(
             self,

cli/entry_points/init.py

@@ -23,9 +23,9 @@ def collect_user_input(fields: list[str]) -> dict[str, str]:
             while field not in res:
                 if value := input(f"{field.capitalize()!s: >20}: "):
                     res[field] = value
-    except KeyboardInterrupt:
+    except KeyboardInterrupt as ki:
         print("--\n")  # Moving the cursor back to the start
-        raise OperationAborted("Operation aborted by the user")
+        raise OperationAborted("Operation aborted by the user") from ki
     return res
 
 
@@ -39,10 +39,10 @@ def read_json_input(fields: list[str]) -> dict[str, str]:
         json_input = json.loads(payload)
         for field in fields:
             res[field] = json_input[field]
-    except KeyError as e:
-        raise OperationAborted(f"'{e}' not found in the input data")
-    except Exception:
-        raise OperationAborted("Invalid input data")
+    except KeyError as ke:
+        raise OperationAborted(f"'{ke}' not found in the input data") from ke
+    except Exception as e:
+        raise OperationAborted("Invalid input data") from e
     return res
 
 

cli/entry_points/migration_check.py

@@ -2,7 +2,7 @@
 import contextlib
 import sys
 from argparse import ArgumentParser
-from typing import Iterator
+from collections.abc import Iterator
 
 from peewee import ColumnMetadata, Database, MySQLDatabase, ProgrammingError
 

cli/entry_points/yoyo.py

@@ -70,14 +70,14 @@ def apply_migrations(self, force: bool = False) -> None:
                     else:
                         LOG.info("Migration '%s' SUCCEEDED", migration.id)
                         applied.append(migration)
-            except Exception:
+            except Exception as e:
                 for migration in reversed(applied):
                     LOG.info("  '-- Rolling back '%s'", migration.id)
                     try:
                         backend.rollback_one(migration, force=True)
                     except Exception as rollback_exp:
                         LOG.exception("Error rolling back migration '%s': %s", migration.id, rollback_exp)
 
-                raise OperationAborted("Migration failed. The new migrations have been rolled back")
+                raise OperationAborted("Migration failed. The new migrations have been rolled back") from e
 
             backend.run_post_apply(migrations, force=force)