From 8902b94ab6efea43c47ee17b82a967a65f22b822 Mon Sep 17 00:00:00 2001 From: Jacob Williamson Date: Thu, 13 Aug 2026 16:53:22 +0100 Subject: [PATCH 1/3] Fix deprecation warning --- src/blueapi/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/blueapi/config.py b/src/blueapi/config.py index a181f4c344..928f652342 100644 --- a/src/blueapi/config.py +++ b/src/blueapi/config.py @@ -238,7 +238,7 @@ class OIDCConfig(BlueapiBaseModel): def check_urls(self) -> Self: if self.issuer is None and self.well_known_url is None: raise ValueError("Please provide 'OIDCConfig.issuer'") - if self.well_known_url: + if "well_known_url" in self.model_fields_set: LOGGER.warning( DeprecationWarning( "OIDCConfig.well_known_url is deprecated, " @@ -250,7 +250,7 @@ def check_urls(self) -> Self: @cached_property def _well_known_url(self) -> str: if self.issuer: - if self.well_known_url: + if "well_known_url" in self.model_fields_set: LOGGER.warning( DeprecationWarning( "well_known_url and issuer are both set. " From 044505a25ae8adb7651069268546e2cb4e4b6d5a Mon Sep 17 00:00:00 2001 From: Jacob Williamson Date: Thu, 13 Aug 2026 16:41:49 +0000 Subject: [PATCH 2/3] Fix tests --- src/blueapi/config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/blueapi/config.py b/src/blueapi/config.py index 928f652342..fcd8542ed9 100644 --- a/src/blueapi/config.py +++ b/src/blueapi/config.py @@ -236,9 +236,9 @@ class OIDCConfig(BlueapiBaseModel): @model_validator(mode="after") def check_urls(self) -> Self: - if self.issuer is None and self.well_known_url is None: + if self.issuer is None and self.__dict__.get("well_known_url") is None: raise ValueError("Please provide 'OIDCConfig.issuer'") - if "well_known_url" in self.model_fields_set: + if self.__dict__.get("well_known_url"): LOGGER.warning( DeprecationWarning( "OIDCConfig.well_known_url is deprecated, " @@ -250,7 +250,7 @@ def check_urls(self) -> Self: @cached_property def _well_known_url(self) -> str: if self.issuer: - if "well_known_url" in self.model_fields_set: + if self.__dict__.get("well_known_url"): LOGGER.warning( DeprecationWarning( "well_known_url and issuer are both set. " From b223a7a884c95a7d2e34ac605dcdb4f435650a0a Mon Sep 17 00:00:00 2001 From: Jacob Williamson Date: Thu, 13 Aug 2026 17:44:42 +0100 Subject: [PATCH 3/3] Log a message instead of a warning --- src/blueapi/config.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/blueapi/config.py b/src/blueapi/config.py index fcd8542ed9..44c322fc2f 100644 --- a/src/blueapi/config.py +++ b/src/blueapi/config.py @@ -240,10 +240,7 @@ def check_urls(self) -> Self: raise ValueError("Please provide 'OIDCConfig.issuer'") if self.__dict__.get("well_known_url"): LOGGER.warning( - DeprecationWarning( - "OIDCConfig.well_known_url is deprecated, " - "Please use OIDCConfig.issuer" - ), + "OIDCConfig.well_known_url is deprecated, Please use OIDCConfig.issuer" ) return self @@ -252,10 +249,7 @@ def _well_known_url(self) -> str: if self.issuer: if self.__dict__.get("well_known_url"): LOGGER.warning( - DeprecationWarning( - "well_known_url and issuer are both set. " - "Defaulting to issuer URL" - ), + "well_known_url and issuer are both set. Defaulting to issuer URL" ) return self.issuer + "/.well-known/openid-configuration" return cast(str, self.well_known_url)