fix BaseProvider.server_settings

Author: dlqqq

packages/jupyter-ai-magics/jupyter_ai_magics/tests/test_base_provider.py

@@ -0,0 +1,27 @@
+from typing import ClassVar, Optional
+
+from pydantic import BaseModel
+
+from ..providers import BaseProvider
+
+
+def test_provider_classvars():
+    """
+    Asserts that class attributes are not omitted due to parent classes defining
+    an instance field of the same name. This was a bug present in Pydantic v1,
+    which led to an issue documented in #558.
+
+    This bug is fixed as of `pydantic==2.10.2`, but we will keep this test in
+    case this behavior changes in future releases.
+    """
+
+    class Parent(BaseModel):
+        test: Optional[str] = None
+
+    class Base(BaseModel):
+        test: ClassVar[str]
+
+    class Child(Base, Parent):
+        test: ClassVar[str] = "expected"
+
+    assert Child.test == "expected"

packages/jupyter-ai-magics/jupyter_ai_magics/tests/test_provider_metaclass.py

@@ -63,7 +63,7 @@ def ai_extension(jp_serverapp):
     # may run in parallel setting it with race condition; because we are not testing
     # the `BaseProvider.server_settings` here, we can just mock the setter
     settings_mock = mock.PropertyMock()
-    with mock.patch.object(BaseProvider.__class__, "server_settings", settings_mock):
+    with mock.patch.object(BaseProvider, "server_settings", settings_mock):
         yield ai