qontract-reconcile 0.10.2.dev394__py3-none-any.whl → 0.10.2.dev414__py3-none-any.whl

tools/cli_commands/cost_report/view.py

@@ -4,6 +4,7 @@ from typing import Any
 
 from pydantic import BaseModel
 
+from reconcile.utils.json import json_dumps
 from tools.cli_commands.cost_report.model import OptimizationReport, Report
 
 LAYOUT = """\
@@ -244,7 +245,7 @@ def render_summary(
     return template.format(
         date=get_date(reports),
         total_cost=format_cost_value(total_cost),
-        json_table=json_table.json(indent=2),
+        json_table=json_dumps(json_table, indent=2, mode="python"),
     )
 
 
@@ -274,7 +275,7 @@ def render_month_over_month_change(reports: Mapping[str, Report]) -> str:
     )
     return MONTH_OVER_MONTH_CHANGE.format(
         date=get_date(reports),
-        json_table=json_table.json(indent=2),
+        json_table=json_dumps(json_table, indent=2, mode="python"),
     )
 
 
@@ -304,7 +305,7 @@ def render_aws_services_cost(
         items_total=format_cost_value(report.items_total),
         items_delta_value=format_delta_value(report.items_delta_value),
         items_delta_percent=format_delta_percent(report.items_delta_percent),
-        json_table=json_table.json(indent=2),
+        json_table=json_dumps(json_table, indent=2, mode="python"),
     )
 
 
@@ -316,7 +317,7 @@ def render_openshift_workloads_cost(
         items_total=format_cost_value(report.items_total),
         items_delta_value=format_delta_value(report.items_delta_value),
         items_delta_percent=format_delta_percent(report.items_delta_percent),
-        json_table=json_table.json(indent=2),
+        json_table=json_dumps(json_table, indent=2, mode="python"),
     )
 
 
@@ -362,7 +363,7 @@ def render_child_apps_cost(report: Report) -> str:
     )
     return CHILD_APPS_COST.format(
         child_apps_total=format_cost_value(report.child_apps_total),
-        json_table=json_table.json(indent=2),
+        json_table=json_dumps(json_table, indent=2, mode="python"),
     )
 
 
@@ -509,7 +510,7 @@ def render_optimization(
     )
     return OPTIMIZATION.format(
         app_name=report.app_name,
-        json_table=json_table.json(indent=2),
+        json_table=json_dumps(json_table, indent=2, mode="python"),
     )
 
 

tools/cli_commands/erv2.py

@@ -133,7 +133,9 @@ class Erv2Cli:
 
     @property
     def input_data(self) -> str:
-        return self._resource.json(exclude={"data": {FLAG_RESOURCE_MANAGED_BY_ERV2}})
+        return self._resource.model_dump_json(
+            exclude={"data": {FLAG_RESOURCE_MANAGED_BY_ERV2}}
+        )
 
     @property
     def image(self) -> str:

tools/qontract_cli.py

@@ -141,6 +141,7 @@ from reconcile.utils.gitlab_api import (
 )
 from reconcile.utils.glitchtip.client import GlitchtipClient
 from reconcile.utils.gql import GqlApiSingleton
+from reconcile.utils.json import json_dumps
 from reconcile.utils.keycloak import (
     KeycloakAPI,
     SSOClient,
@@ -1566,7 +1567,7 @@ def rosa_create_cluster_command(ctx: click.Context, cluster_name: str) -> None:
         billing_account = account.billing_account.uid
     else:
         with AWSApi(
-            1, [account.dict(by_alias=True)], settings=settings, init_users=False
+            1, [account.model_dump(by_alias=True)], settings=settings, init_users=False
         ) as aws_api:
             billing_account = aws_api.get_organization_billing_account(account.name)
 
@@ -1750,7 +1751,7 @@ def aws_terraform_resources(ctx: click.Context) -> None:
     for ns_info in namespaces:
         specs = (
             get_external_resource_specs(
-                ns_info.dict(by_alias=True), provision_provider=PROVIDER_AWS
+                ns_info.model_dump(by_alias=True), provision_provider=PROVIDER_AWS
             )
             or []
         )
@@ -1808,7 +1809,7 @@ def rds(ctx: click.Context) -> None:
         specs = [
             s
             for s in get_external_resource_specs(
-                namespace.dict(by_alias=True), provision_provider=PROVIDER_AWS
+                namespace.model_dump(by_alias=True), provision_provider=PROVIDER_AWS
             )
             if s.provider == "rds"
         ]
@@ -2961,7 +2962,7 @@ def maintenances(ctx: click.Context) -> None:
     maintenances = maintenances_gql.query(gql.get_api().query).maintenances or []
     data = [
         {
-            **m.dict(),
+            **m.model_dump(),
             "services": ", ".join(a.name for a in m.affected_services),
         }
         for m in maintenances
@@ -4298,7 +4299,7 @@ def create(
         bg="red",
         fg="white",
     )
-    print(sso_client.json(by_alias=True, indent=2))
+    print(json_dumps(sso_client, indent=2))
 
 
 @sso_client.command()

tools/template_validation.py

@@ -67,7 +67,9 @@ def main(templates: tuple[str]) -> None:
             tests.append(test_yaml)
 
         template_raw["templateTest"] = tests
-        template: TemplateV1 = TemplateV1(**data_default_none(TemplateV1, template_raw))
+        data = data_default_none(TemplateV1, template_raw)
+        assert isinstance(data, dict)
+        template: TemplateV1 = TemplateV1(**data)
 
         # templates_to_validate = {}
         for test in template.template_test: