chore: py3.8 setting for pyright, CamelCase type alias

Author: dimaqq

juju/client/connection.py

@@ -23,10 +23,10 @@
 from juju.utils import IdQueue
 from juju.version import CLIENT_VERSION
 
-from .facade import _JSON, _RICH_JSON, TypeEncoder
+from .facade import TypeEncoder, _Json, _RichJson
 from .facade_versions import client_facade_versions, known_unsupported_facades
 
-SPECIFIED_FACADES: TypeAlias = "dict[str, dict[Literal['versions'], Sequence[int]]]"
+SpecifiedFacades: TypeAlias = "dict[str, dict[Literal['versions'], Sequence[int]]]"
 _WebSocket: TypeAlias = "websockets.legacy.client.WebSocketClientProtocol"
 
 LEVELS = ["TRACE", "DEBUG", "INFO", "WARNING", "ERROR"]
@@ -140,7 +140,7 @@ async def connect(
         max_frame_size: int | None = None,
         retries=3,
         retry_backoff=10,
-        specified_facades: SPECIFIED_FACADES | None = None,
+        specified_facades: SpecifiedFacades | None = None,
         proxy=None,
         debug_log_conn=None,
         debug_log_params={},
@@ -542,17 +542,17 @@ async def _do_ping():
 
     @overload
     async def rpc(
-        self, msg: dict[str, _JSON], encoder: None = None
-    ) -> dict[str, _JSON]: ...
+        self, msg: dict[str, _Json], encoder: None = None
+    ) -> dict[str, _Json]: ...
 
     @overload
     async def rpc(
-        self, msg: dict[str, _RICH_JSON], encoder: TypeEncoder
-    ) -> dict[str, _JSON]: ...
+        self, msg: dict[str, _RichJson], encoder: TypeEncoder
+    ) -> dict[str, _Json]: ...
 
     async def rpc(
         self, msg: dict[str, Any], encoder: json.JSONEncoder | None = None
-    ) -> dict[str, Any]:
+    ) -> dict[str, _Json]:
         """Make an RPC to the API. The message is encoded as JSON
         using the given encoder if any.
         :param msg: Parameters for the call (will be encoded as JSON).

juju/client/facade.py

@@ -23,12 +23,12 @@
 from . import codegen
 
 # Plain JSON, what is received from Juju
-_JSON_LEAF: TypeAlias = "None | bool | int | float | str"
-_JSON: TypeAlias = "_JSON_LEAF|list[_JSON]|dict[str, _JSON]"
+_JsonLeaf: TypeAlias = "None | bool | int | float | str"
+_Json: TypeAlias = "_JsonLeaf|list[_Json]|dict[str, _Json]"
 
 # Type-enriched JSON, what can be sent to Juju
-_RICH_LEAF: TypeAlias = "_JSON_LEAF|Type"
-_RICH_JSON: TypeAlias = "_RICH_LEAF|list[_RICH_JSON]|dict[str, _RICH_JSON]"
+_RichLeaf: TypeAlias = "_JsonLeaf|Type"
+_RichJson: TypeAlias = "_RichLeaf|list[_RichJson]|dict[str, _RichJson]"
 
 _marker = object()
 
@@ -644,7 +644,7 @@ class {name}Facade(Type):
 
 
 class TypeEncoder(json.JSONEncoder):
-    def default(self, obj: _RICH_JSON) -> _JSON:
+    def default(self, obj: _RichJson) -> _Json:
         if isinstance(obj, Type):
             return obj.serialize()
         return json.JSONEncoder.default(self, obj)
@@ -663,7 +663,7 @@ def __eq__(self, other):
 
         return self.__dict__ == other.__dict__
 
-    async def rpc(self, msg: dict[str, _RICH_JSON]) -> _JSON:
+    async def rpc(self, msg: dict[str, _RichJson]) -> _Json:
         result = await self.connection.rpc(msg, encoder=TypeEncoder)
         return result
 
@@ -714,7 +714,7 @@ def _parse_nested_list_entry(expr, result_dict):
             return cls(**d)
         return None
 
-    def serialize(self) -> dict[str, _JSON]:
+    def serialize(self) -> dict[str, _Json]:
         d = {}
         for attr, tgt in self._toSchema.items():
             d[tgt] = getattr(self, attr)

pyproject.toml

@@ -211,8 +211,8 @@ ignore = [
 
 [tool.pyright]
 # These are tentative
-# include = ["**/*.py"]
-pythonVersion = "3.10"
+include = ["**/*.py"]
+pythonVersion = "3.8"
 typeCheckingMode = "strict"
 useLibraryCodeForTypes = true
 reportGeneralTypeIssues = true