Merge remote-tracking branch 'upstream/main'

Author: mgradalska

ariadne_codegen/client_generators/dependencies/async_base_client.py

@@ -18,6 +18,8 @@
 try:
     from websockets import (  # type: ignore[import-not-found,unused-ignore]
         ClientConnection,
+    )
+    from websockets import (
         connect as ws_connect,
     )
     from websockets.typing import (  # type: ignore[import-not-found,unused-ignore]

ariadne_codegen/client_generators/dependencies/async_base_client_open_telemetry.py

@@ -29,6 +29,8 @@
 try:
     from websockets import (  # type: ignore[import-not-found,unused-ignore]
         ClientConnection,
+    )
+    from websockets import (
         connect as ws_connect,
     )
     from websockets.typing import (  # type: ignore[import-not-found,unused-ignore]

ariadne_codegen/settings.py

@@ -175,7 +175,7 @@ def used_settings_message(self) -> str:
             Generating package into '{self.target_package_path}'.
             Using '{self.client_name}' as client name.
             Using '{self.base_client_name}' as base client class.
-            Coping base client class from '{self.base_client_file_path}'.
+            Copying base client class from '{self.base_client_file_path}'.
             Generating enums into '{self.enums_module_name}.py'.
             Generating inputs into '{self.input_types_module_name}.py'.
             Generating fragments into '{self.fragments_module_name}.py'.

pyproject.toml

@@ -46,7 +46,7 @@ test = [
   "pytest-mock",
   "requests-toolbelt",
   "types-toml",
-  "websockets~=11.0",
+  "websockets>=14.2",
   "opentelemetry-api",
 ]
 types = ["mypy>=1.0.0"]

tests/main/clients/client_forward_refs/expected_client/async_base_client.py

@@ -18,6 +18,8 @@
 try:
     from websockets import (  # type: ignore[import-not-found,unused-ignore]
         ClientConnection,
+    )
+    from websockets import (
         connect as ws_connect,
     )
     from websockets.typing import (  # type: ignore[import-not-found,unused-ignore]

tests/main/clients/client_forward_refs_shorter_results/expected_client/async_base_client.py

@@ -18,6 +18,8 @@
 try:
     from websockets import (  # type: ignore[import-not-found,unused-ignore]
         ClientConnection,
+    )
+    from websockets import (
         connect as ws_connect,
     )
     from websockets.typing import (  # type: ignore[import-not-found,unused-ignore]

tests/main/clients/custom_config_file/expected_client/async_base_client.py

@@ -18,6 +18,8 @@
 try:
     from websockets import (  # type: ignore[import-not-found,unused-ignore]
         ClientConnection,
+    )
+    from websockets import (
         connect as ws_connect,
     )
     from websockets.typing import (  # type: ignore[import-not-found,unused-ignore]

tests/main/clients/custom_files_names/expected_client/async_base_client.py

@@ -18,6 +18,8 @@
 try:
     from websockets import (  # type: ignore[import-not-found,unused-ignore]
         ClientConnection,
+    )
+    from websockets import (
         connect as ws_connect,
     )
     from websockets.typing import (  # type: ignore[import-not-found,unused-ignore]

tests/main/clients/custom_query_builder/expected_client/async_base_client.py

@@ -18,6 +18,8 @@
 try:
     from websockets import (  # type: ignore[import-not-found,unused-ignore]
         ClientConnection,
+    )
+    from websockets import (
         connect as ws_connect,
     )
     from websockets.typing import (  # type: ignore[import-not-found,unused-ignore]

tests/main/clients/custom_scalars/expected_client/async_base_client.py

@@ -18,6 +18,8 @@
 try:
     from websockets import (  # type: ignore[import-not-found,unused-ignore]
         ClientConnection,
+    )
+    from websockets import (
         connect as ws_connect,
     )
     from websockets.typing import (  # type: ignore[import-not-found,unused-ignore]

tests/main/clients/example/expected_client/async_base_client.py

@@ -18,6 +18,8 @@
 try:
     from websockets import (  # type: ignore[import-not-found,unused-ignore]
         ClientConnection,
+    )
+    from websockets import (
         connect as ws_connect,
     )
     from websockets.typing import (  # type: ignore[import-not-found,unused-ignore]

tests/main/clients/extended_models/expected_client/async_base_client.py

@@ -18,6 +18,8 @@
 try:
     from websockets import (  # type: ignore[import-not-found,unused-ignore]
         ClientConnection,
+    )
+    from websockets import (
         connect as ws_connect,
     )
     from websockets.typing import (  # type: ignore[import-not-found,unused-ignore]

tests/main/clients/fragments_on_abstract_types/expected_client/async_base_client.py

@@ -18,6 +18,8 @@
 try:
     from websockets import (  # type: ignore[import-not-found,unused-ignore]
         ClientConnection,
+    )
+    from websockets import (
         connect as ws_connect,
     )
     from websockets.typing import (  # type: ignore[import-not-found,unused-ignore]

tests/main/clients/inline_fragments/expected_client/async_base_client.py

@@ -18,6 +18,8 @@
 try:
     from websockets import (  # type: ignore[import-not-found,unused-ignore]
         ClientConnection,
+    )
+    from websockets import (
         connect as ws_connect,
     )
     from websockets.typing import (  # type: ignore[import-not-found,unused-ignore]

tests/main/clients/interface_as_fragment/expected_client/async_base_client.py

@@ -18,6 +18,8 @@
 try:
     from websockets import (  # type: ignore[import-not-found,unused-ignore]
         ClientConnection,
+    )
+    from websockets import (
         connect as ws_connect,
     )
     from websockets.typing import (  # type: ignore[import-not-found,unused-ignore]

tests/main/clients/multiple_fragments/expected_client/async_base_client.py

@@ -18,6 +18,8 @@
 try:
     from websockets import (  # type: ignore[import-not-found,unused-ignore]
         ClientConnection,
+    )
+    from websockets import (
         connect as ws_connect,
     )
     from websockets.typing import (  # type: ignore[import-not-found,unused-ignore]

tests/main/clients/only_used_inputs_and_enums/expected_client/async_base_client.py

@@ -18,6 +18,8 @@
 try:
     from websockets import (  # type: ignore[import-not-found,unused-ignore]
         ClientConnection,
+    )
+    from websockets import (
         connect as ws_connect,
     )
     from websockets.typing import (  # type: ignore[import-not-found,unused-ignore]

tests/main/clients/operations/expected_client/async_base_client.py

@@ -18,6 +18,8 @@
 try:
     from websockets import (  # type: ignore[import-not-found,unused-ignore]
         ClientConnection,
+    )
+    from websockets import (
         connect as ws_connect,
     )
     from websockets.typing import (  # type: ignore[import-not-found,unused-ignore]

tests/main/clients/remote_schema/expected_client/async_base_client.py

@@ -18,6 +18,8 @@
 try:
     from websockets import (  # type: ignore[import-not-found,unused-ignore]
         ClientConnection,
+    )
+    from websockets import (
         connect as ws_connect,
     )
     from websockets.typing import (  # type: ignore[import-not-found,unused-ignore]

tests/main/clients/shorter_results/expected_client/async_base_client.py

@@ -18,6 +18,8 @@
 try:
     from websockets import (  # type: ignore[import-not-found,unused-ignore]
         ClientConnection,
+    )
+    from websockets import (
         connect as ws_connect,
     )
     from websockets.typing import (  # type: ignore[import-not-found,unused-ignore]

tests/main/custom_operation_builder/graphql_client/async_base_client.py

@@ -18,6 +18,8 @@
 try:
     from websockets import (  # type: ignore[import-not-found,unused-ignore]
         ClientConnection,
+    )
+    from websockets import (
         connect as ws_connect,
     )
     from websockets.typing import (  # type: ignore[import-not-found,unused-ignore]