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

reconcile/utils/glitchtip/client.py

@@ -164,7 +164,9 @@ class GlitchtipClient(ApiBase):
         return ProjectAlert(
             **self._post(
                 f"/api/0/projects/{organization_slug}/{project_slug}/alerts/",
-                data=alert.dict(by_alias=True, exclude_unset=True, exclude_none=True),
+                data=alert.model_dump(
+                    by_alias=True, exclude_unset=True, exclude_none=True
+                ),
             )
         )
 
@@ -183,7 +185,9 @@ class GlitchtipClient(ApiBase):
         return ProjectAlert(
             **self._put(
                 f"/api/0/projects/{organization_slug}/{project_slug}/alerts/{alert.pk}/",
-                data=alert.dict(by_alias=True, exclude_unset=True, exclude_none=True),
+                data=alert.model_dump(
+                    by_alias=True, exclude_unset=True, exclude_none=True
+                ),
             )
         )
 

reconcile/utils/glitchtip/models.py

@@ -3,13 +3,13 @@ from __future__ import annotations
 import re
 from datetime import datetime
 from enum import Enum
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, Self
 
 from pydantic import (
     BaseModel,
     Field,
-    root_validator,
-    validator,
+    field_validator,
+    model_validator,
 )
 
 if TYPE_CHECKING:
@@ -49,7 +49,8 @@ class Team(BaseModel):
     slug: str = ""
     users: list[User] = []
 
-    @root_validator(pre=True)
+    @model_validator(mode="before")
+    @classmethod
     def name_xor_slug_must_be_set(
         cls, values: MutableMapping[str, Any]
     ) -> MutableMapping[str, Any]:
@@ -58,11 +59,11 @@ class Team(BaseModel):
         ), "name xor slug must be set!"
         return values
 
-    @root_validator
-    def slugify(cls, values: MutableMapping[str, Any]) -> MutableMapping[str, Any]:
-        values["slug"] = values.get("slug") or slugify(values.get("name", ""))
-        values["name"] = slugify(values.get("name", "")) or values.get("slug")
-        return values
+    @model_validator(mode="after")
+    def slugify(self) -> Self:
+        self.slug = self.slug or slugify(self.name)
+        self.name = slugify(self.name) or self.slug
+        return self
 
     def __lt__(self, other: Team) -> bool:
         return self.slug < other.slug
@@ -86,16 +87,15 @@ class RecipientType(Enum):
     WEBHOOK = "webhook"
 
 
-class ProjectAlertRecipient(BaseModel):
+class ProjectAlertRecipient(
+    BaseModel, validate_by_name=True, validate_by_alias=True, use_enum_values=True
+):
     pk: int | None = Field(None, alias="id")
     recipient_type: RecipientType = Field(..., alias="recipientType")
     url: str = ""
 
-    class Config:
-        allow_population_by_field_name = True
-        use_enum_values = True
-
-    @validator("recipient_type")
+    @field_validator("recipient_type")
+    @classmethod
     def recipient_type_enforce_enum_type(cls, v: str | RecipientType) -> RecipientType:
         if isinstance(v, RecipientType):
             return v
@@ -113,17 +113,15 @@ class ProjectAlertRecipient(BaseModel):
         return hash((self.recipient_type, self.url))
 
 
-class ProjectAlert(BaseModel):
+class ProjectAlert(BaseModel, validate_by_name=True, validate_by_alias=True):
     pk: int | None = Field(None, alias="id")
     name: str
     timespan_minutes: int = Field(..., alias="timespanMinutes")
     quantity: int
     recipients: list[ProjectAlertRecipient] = Field([], alias="alertRecipients")
 
-    class Config:
-        allow_population_by_field_name = True
-
-    @root_validator
+    @model_validator(mode="before")
+    @classmethod
     def empty_name(cls, values: MutableMapping[str, Any]) -> MutableMapping[str, Any]:
         # name is an empty string if the alert was created manually because it can't be set via UI
         # use the pk instead.
@@ -141,20 +139,18 @@ class ProjectAlert(BaseModel):
         )
 
 
-class Project(BaseModel):
+class Project(BaseModel, validate_by_name=True, validate_by_alias=True):
     pk: int | None = Field(None, alias="id")
     name: str
     slug: str = ""
-    platform: str | None
+    platform: str | None = None
     teams: list[Team] = []
     alerts: list[ProjectAlert] = []
     event_throttle_rate: int = Field(0, alias="eventThrottleRate")
     organization: Organization | None = None
 
-    class Config:
-        allow_population_by_field_name = True
-
-    @root_validator
+    @model_validator(mode="before")
+    @classmethod
     def slugify(cls, values: MutableMapping[str, Any]) -> MutableMapping[str, Any]:
         values["slug"] = values.get("slug") or slugify(values["name"])
         return values
@@ -195,7 +191,8 @@ class Organization(BaseModel):
     teams: list[Team] = []
     users: list[User] = []
 
-    @root_validator
+    @model_validator(mode="before")
+    @classmethod
     def slugify(cls, values: MutableMapping[str, Any]) -> MutableMapping[str, Any]:
         values["slug"] = values.get("slug") or slugify(values["name"])
         return values
@@ -212,4 +209,4 @@ class Organization(BaseModel):
         return hash(self.name)
 
 
-Project.update_forward_refs()
+Project.model_rebuild()

reconcile/utils/gql.py

@@ -109,7 +109,7 @@ class GqlApi:
         if int_name:
             integrations = self.query(INTEGRATIONS_QUERY, skip_validation=True)
 
-            for integration in integrations["integrations"]:
+            for integration in integrations["integrations"] if integrations else []:
                 if integration["name"] == int_name:
                     self._valid_schemas = integration["schemas"]
                     break
@@ -142,7 +142,7 @@ class GqlApi:
         query: str,
         variables: dict[str, Any] | None = None,
         skip_validation: bool = False,
-    ) -> dict[str, Any] | None:
+    ) -> dict[str, Any]:
         try:
             result = self.client.execute(
                 gql(query), variables, get_execution_result=True
@@ -172,11 +172,8 @@ class GqlApi:
             if forbidden_schemas:
                 raise GqlApiErrorForbiddenSchemaError(forbidden_schemas)
 
-        # This is to appease mypy. This exception won't be thrown as this condition
-        # is already handled above with AssertionError
-        if result["data"] is None:
-            raise GqlApiError("`data` not received in GraphQL payload")
-
+        # make mypy happy
+        assert "data" in result and result["data"] is not None
         return result["data"]
 
     def get_template(self, path: str) -> dict[str, str]:

reconcile/utils/instrumented_wrappers.py

@@ -40,7 +40,7 @@ class InstrumentedImage(Image):
 
 
 class InstrumentedSkopeo(Skopeo):
-    def copy(self, *args: Any, **kwargs: Any) -> bytes | str:
+    def copy(self, *args: Any, **kwargs: Any) -> None:
         metrics.copy_count.labels(
             integration=INTEGRATION_NAME, shard=SHARDS, shard_id=SHARD_ID
         ).inc()

reconcile/utils/internal_groups/client.py

@@ -140,7 +140,7 @@ class InternalGroupsClient:
         with self._api as api:
             return Group(
                 **api.create_group(
-                    data=group.dict(by_alias=True),
+                    data=group.model_dump(by_alias=True),
                 )
             )
 
@@ -155,6 +155,6 @@ class InternalGroupsClient:
             return Group(
                 **api.update_group(
                     name=group.name,
-                    data=group.dict(by_alias=True),
+                    data=group.model_dump(by_alias=True),
                 )
             )

reconcile/utils/internal_groups/models.py

@@ -27,7 +27,7 @@ class Entity(BaseModel):
         return hash(self.id)
 
 
-class Group(BaseModel):
+class Group(BaseModel, validate_by_name=True, validate_by_alias=True):
     name: str
     description: str
     member_approval_type: str = Field("self-service", alias="memberApprovalType")
@@ -35,16 +35,18 @@ class Group(BaseModel):
     owners: list[Entity]
     display_name: str = Field(..., alias="displayName")
     notes: str | None = None
-    rover_group_member_query: str | None = Field(None, alias="roverGroupMemberQuery")
+    rover_group_member_query: str | None = Field(
+        None, alias="roverGroupMemberQuery", exclude=True
+    )
     rover_group_inclusions: list[Entity] | None = Field(
-        None, alias="roverGroupInclusions"
+        None, alias="roverGroupInclusions", exclude=True
     )
     rover_group_exclusions: list[Entity] | None = Field(
-        None, alias="roverGroupExclusions"
+        None, alias="roverGroupExclusions", exclude=True
     )
     members: list[Entity] = []
-    member_of: list[str] | None = Field(None, alias="memberOf")
-    namespace: str | None = None
+    member_of: list[str] | None = Field(None, alias="memberOf", exclude=True)
+    namespace: str | None = Field(None, exclude=True)
 
     def __eq__(self, other: object) -> bool:
         if not isinstance(other, Group):
@@ -58,14 +60,3 @@ class Group(BaseModel):
             and self.notes == other.notes
             and set(self.members) == set(other.members)
         )
-
-    class Config:
-        allow_population_by_field_name = True
-        # exclude read-only fields in the json/dict dumps
-        fields = {
-            "rover_group_member_query": {"exclude": True},
-            "rover_group_inclusions": {"exclude": True},
-            "rover_group_exclusions": {"exclude": True},
-            "member_of": {"exclude": True},
-            "namespace": {"exclude": True},
-        }

reconcile/utils/jinja2/utils.py

@@ -45,14 +45,11 @@ class Jinja2TemplateError(Exception):
         super().__init__("error processing jinja2 template: " + str(msg))
 
 
-class TemplateRenderOptions(BaseModel):
+class TemplateRenderOptions(BaseModel, frozen=True):
     trim_blocks: bool
     lstrip_blocks: bool
     keep_trailing_newline: bool
 
-    class Config:
-        frozen = True
-
     @classmethod
     def create(
         cls,
@@ -75,7 +72,7 @@ def compile_jinja2_template(
 ) -> Any:
     if not template_render_options:
         template_render_options = TemplateRenderOptions.create()
-    env: dict[str, Any] = template_render_options.dict()
+    env: dict[str, Any] = template_render_options.model_dump()
     if extra_curly:
         env.update({
             "block_start_string": "{{%",

reconcile/utils/jobcontroller/controller.py

@@ -100,7 +100,7 @@ class K8sJobController:
         """
         new_cache = {}
         for item in self.oc.get_items(
-            kind="Job",
+            kind="Job.batch",
             namespace=self.namespace,
         ):
             openshift_resource = OpenshiftResource(

reconcile/utils/jobcontroller/models.py

@@ -38,6 +38,8 @@ class JobValidationError(Exception):
 
 
 JOB_GENERATION_ANNOTATION = "qontract-reconcile/job.generation"
+MAX_JOB_NAME_LENGTH = 63
+UNIT_OF_WORK_DIGEST_LENGTH = 10
 
 
 class K8sJob(ABC):
@@ -72,7 +74,21 @@ class K8sJob(ABC):
     """
 
     def name(self) -> str:
-        return f"{self.name_prefix()}-{self.unit_of_work_digest()}"
+        """
+        Generate the full job name by combining the name prefix with a digest.
+
+        The name is constructed from the name_prefix (truncated to ensure total
+        length compliance) and the unit_of_work_digest. The total length is
+        limited to MAX_JOB_NAME_LENGTH (63 characters) to comply with Kubernetes
+        naming constraints.
+
+        Returns:
+            A unique job name in the format: {name_prefix}-{digest}
+        """
+        prefix = self.name_prefix()[
+            : MAX_JOB_NAME_LENGTH - UNIT_OF_WORK_DIGEST_LENGTH - 1
+        ]
+        return f"{prefix}-{self.unit_of_work_digest(UNIT_OF_WORK_DIGEST_LENGTH)}"
 
     @abstractmethod
     def name_prefix(self) -> str:

reconcile/utils/json.py

@@ -1,15 +1,48 @@
 import json
-from typing import Any
+from collections.abc import Callable
+from dataclasses import asdict, is_dataclass
+from datetime import date, datetime
+from decimal import Decimal
+from enum import Enum
+from typing import Any, Literal
+
+from pydantic import BaseModel
 
 JSON_COMPACT_SEPARATORS = (",", ":")
 
 
+def pydantic_encoder(obj: Any) -> Any:
+    if isinstance(obj, BaseModel):
+        return obj.model_dump()
+
+    if is_dataclass(obj):
+        return asdict(obj)  # type: ignore
+
+    if isinstance(obj, (datetime, date)):
+        return obj.isoformat()
+
+    if isinstance(obj, Enum):
+        return obj.value
+
+    if isinstance(obj, Decimal):
+        return float(obj)
+
+    raise TypeError(
+        f"Object of type '{obj.__class__.__name__}' is not JSON serializable"
+    )
+
+
 def json_dumps(
     data: Any,
     *,
     compact: bool = False,
     indent: int | None = None,
     cls: type[json.JSONEncoder] | None = None,
+    defaults: Callable | None = None,
+    # BaseModel dump parameters
+    by_alias: bool = True,
+    exclude_none: bool = False,
+    mode: Literal["json", "python"] = "json",
 ) -> str:
     """
     Serialize `data` to a consistent JSON formatted `str` with dict keys sorted.
@@ -22,6 +55,10 @@ def json_dumps(
     Returns:
         A JSON formatted string.
     """
+    if isinstance(data, BaseModel):
+        data = data.model_dump(mode=mode, by_alias=by_alias, exclude_none=exclude_none)
+        if mode == "python":
+            defaults = pydantic_encoder
     separators = JSON_COMPACT_SEPARATORS if compact else None
     return json.dumps(
         data,
@@ -29,4 +66,5 @@ def json_dumps(
         separators=separators,
         sort_keys=True,
         cls=cls,
+        default=defaults,
     )

reconcile/utils/membershipsources/app_interface_resolver.py

@@ -55,6 +55,8 @@ def resolve_app_interface_membership_source(
 
 def build_member_list(role: RoleV1) -> list[RoleMember]:
     members: list[RoleMember] = []
-    members.extend([RoleUser(**u.dict()) for u in role.users or []])
-    members.extend([RoleBot(**b.dict()) for b in role.bots or [] if b.org_username])
+    members.extend([RoleUser(**u.model_dump()) for u in role.users or []])
+    members.extend([
+        RoleBot(**b.model_dump()) for b in role.bots or [] if b.org_username
+    ])
     return members

reconcile/utils/membershipsources/models.py

@@ -7,7 +7,6 @@ from typing import (
 
 from pydantic import (
     BaseModel,
-    Extra,
 )
 
 from reconcile.gql_definitions.fragments.membership_source import (
@@ -23,7 +22,7 @@ class User(Protocol):
     @property
     def org_username(self) -> str: ...
 
-    def dict(self, *, by_alias: bool = False) -> dict[str, Any]: ...
+    def model_dump(self, *, by_alias: bool = False) -> dict[str, Any]: ...
 
 
 class Bot(Protocol):
@@ -33,7 +32,7 @@ class Bot(Protocol):
     @property
     def org_username(self) -> str | None: ...
 
-    def dict(self, *, by_alias: bool = False) -> dict[str, Any]: ...
+    def model_dump(self, *, by_alias: bool = False) -> dict[str, Any]: ...
 
 
 class RoleWithMemberships(Protocol):
@@ -50,33 +49,27 @@ class RoleWithMemberships(Protocol):
     def member_sources(self) -> Sequence[RoleMembershipSource] | None: ...
 
 
-class RoleUser(BaseModel):
+class RoleUser(BaseModel, extra="ignore"):
     name: str
     org_username: str
-    github_username: str | None
-    quay_username: str | None
-    pagerduty_username: str | None
-    aws_username: str | None
-    cloudflare_user: str | None
-    public_gpg_key: str | None
+    github_username: str | None = None
+    quay_username: str | None = None
+    pagerduty_username: str | None = None
+    aws_username: str | None = None
+    cloudflare_user: str | None = None
+    public_gpg_key: str | None = None
     tag_on_cluster_updates: bool | None = False
     tag_on_merge_requests: bool | None = False
 
-    class Config:
-        extra = Extra.ignore
 
-
-class RoleBot(BaseModel):
+class RoleBot(BaseModel, extra="ignore"):
     name: str
-    description: str | None
-    org_username: str | None
-    github_username: str | None
-    gitlab_username: str | None
-    openshift_serviceaccount: str | None
-    quay_username: str | None
-
-    class Config:
-        extra = Extra.ignore
+    description: str | None = None
+    org_username: str | None = None
+    github_username: str | None = None
+    gitlab_username: str | None = None
+    openshift_serviceaccount: str | None = None
+    quay_username: str | None = None
 
 
 RoleMember = RoleUser | RoleBot

reconcile/utils/membershipsources/resolver.py

@@ -98,8 +98,10 @@ def resolve_role_members(
         members: list[RoleMember] = []
 
         # bring in the local users and bots ...
-        members.extend(RoleUser(**u.dict()) for u in r.users or [])
-        members.extend(RoleBot(**b.dict()) for b in r.bots or [] if b.org_username)
+        members.extend(RoleUser(**u.model_dump()) for u in r.users or [])
+        members.extend(
+            RoleBot(**b.model_dump()) for b in r.bots or [] if b.org_username
+        )
 
         # ... and enhance with the ones from member sources
         for ms in r.member_sources or []:

reconcile/utils/merge_request_manager/merge_request_manager.py

@@ -42,7 +42,7 @@ class MergeRequestManagerBase[T: BaseModel]:
         expected_data: dict[str, Any],
     ) -> OpenMergeRequest | None:
         for mr in self._open_mrs:
-            mr_info_dict = mr.mr_info.dict()
+            mr_info_dict = mr.mr_info.model_dump()
             if all(mr_info_dict.get(k) == expected_data.get(k) for k in expected_data):
                 return mr
 

reconcile/utils/merge_request_manager/parser.py

@@ -60,8 +60,8 @@ class Parser[T: BaseModel]:
 
         if self.expected_version != self._find_by_name(self.version_ref, parts[1]):
             raise ParserVersionError("Version is outdated")
-        return self.klass(
-            **data_default_none(
-                self.klass, self._data_from_description(parts[1]), use_defaults=False
-            )
+        data = data_default_none(
+            self.klass, self._data_from_description(parts[1]), use_defaults=False
         )
+        assert isinstance(data, dict)
+        return self.klass(**data)

reconcile/utils/metrics.py

@@ -144,7 +144,7 @@ class GaugeMetric(BaseMetric):
 
     @classmethod
     def metric_family(cls) -> GaugeMetricFamily:
-        labels = [f.alias for f in cls.__fields__.values()]
+        labels = [f.alias or name for name, f in cls.model_fields.items()]
         return GaugeMetricFamily(cls.name(), cls.__doc__ or "", labels=labels)
 
     @classmethod
@@ -167,7 +167,7 @@ class CounterMetric(BaseMetric):
 
     @classmethod
     def metric_family(cls) -> CounterMetricFamily:
-        labels = [f.alias for f in cls.__fields__.values()]
+        labels = [f.alias or name for name, f in cls.model_fields.items()]
         return CounterMetricFamily(cls.name(), cls.__doc__ or "", labels=labels)
 
     @classmethod
@@ -198,7 +198,7 @@ class MetricsContainer:
         """
         Sets the value of the given gauge metric to the given value.
         """
-        label_values = tuple(metric.dict(by_alias=True).values())
+        label_values = tuple(metric.model_dump(by_alias=True).values())
         self._gauges[metric.__class__][label_values] = value
 
     def set_info(self, metric: InfoMetric) -> None:
@@ -213,7 +213,7 @@ class MetricsContainer:
         Increases the value of the given counter by the given amount.
         """
         # all label values need to be strings, so lets convert them
-        label_values = tuple(str(v) for v in counter.dict(by_alias=True).values())
+        label_values = tuple(str(v) for v in counter.model_dump(by_alias=True).values())
         current_value = self._counters[counter.__class__].get(label_values) or 0
         self._counters[counter.__class__][label_values] = current_value + by
 
@@ -270,7 +270,7 @@ class MetricsContainer:
             (
                 metric_class(**{
                     key: labels[i]
-                    for i, key in enumerate(metric_class.__fields__.keys())
+                    for i, key in enumerate(metric_class.model_fields.keys())
                 }),
                 value,
             )