Code Formatting

Author: cnzakii

pyproject.toml

@@ -15,88 +15,47 @@
 # limitations under the License.
 
 
-## ruff settings ##
-[tool.ruff]
-# Exclude a variety of commonly ignored directories.
-exclude = [
-    ".bzr",
-    ".direnv",
-    ".eggs",
-    ".git",
-    ".git-rewrite",
-    ".hg",
-    ".ipynb_checkpoints",
-    ".mypy_cache",
-    ".nox",
-    ".pants.d",
-    ".pyenv",
-    ".pytest_cache",
-    ".pytype",
-    ".ruff_cache",
-    ".svn",
-    ".tox",
-    ".venv",
-    ".vscode",
-    "__pypackages__",
-    "_build",
-    "buck-out",
-    "build",
-    "dist",
-    "node_modules",
-    "site-packages",
-    "venv",
-    "samples/proto",
-]
-
-# Same as Black.
-line-length = 88
-indent-width = 4
+### Ruff settings ###
 
-target-version = "py38"
-
-[tool.ruff.lint]
-# Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`)  codes by default.
-# Unlike Flake8, Ruff doesn't enable pycodestyle warnings (`W`) or
-# McCabe complexity (`C901`) by default.
-select = ["E4", "E7", "E9", "F"]
-ignore = []
-
-# Allow fix for all enabled rules (when `--fix`) is provided.
-fixable = ["ALL"]
-unfixable = []
-
-# Allow unused variables when underscore-prefixed.
-dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
+# Top-level
+[tool.ruff]
+target-version = "py39"
+line-length = 120
+extend-exclude = ["samples/proto"]
 
+# Format
 [tool.ruff.format]
-# Like Black, use double quotes for strings.
-quote-style = "double"
-
-# Like Black, indent with spaces, rather than tabs.
-indent-style = "space"
+docstring-code-format = true
 
-# Like Black, respect magic trailing commas.
-skip-magic-trailing-comma = false
+# Lint
+[tool.ruff.lint]
+select = [
+    "E", # pycodestyle errors
+    "W", # pycodestyle warnings
+    "F", # pyflakes
+    "I", # Check for missing imports (auto-fixable)
+    "UP", # pyupgrade
+    "ASYNC", # flake8-async
+    "ISC", # Checks for implicit literal string concatenation (auto-fixable)
+    "LOG", # Checking the use of logging objects
+    "G",  # Check for logging format issues (auto-fixable)
+]
+ignore = [
+    "ISC001" # may casue conflict with ruff
+]
 
-# Like Black, automatically detect the appropriate line ending.
-line-ending = "auto"
 
-# Enable auto-formatting of code examples in docstrings. Markdown,
-# reStructuredText code/literal blocks and doctests are all supported.
-docstring-code-format = true
+[tool.ruff.lint.isort]
+combine-as-imports = true
 
-# Set the line length limit used when formatting code snippets in
-# docstrings.
-#
-# This only has an effect when the `docstring-code-format` setting is
-# enabled.
-docstring-code-line-length = "dynamic"
+section-order = [
+  "future",
+  "standard-library",
+  "third-party",
+  "first-party",
+  "local-folder"
+]
 
 
-## pytest settings ##
-[tool.pytest.ini_options]
-addopts = [
-    "-ra",
-    "-p", "no:warnings"
-]
-testpaths = ["tests"]
+[tool.mypy]
+files = "src"

samples/helloworld/client.py

@@ -27,9 +27,7 @@ def say_hello(self, message: bytes) -> bytes:
 
 if __name__ == "__main__":
     # Create a client
-    reference_config = ReferenceConfig.from_url(
-        "tri://127.0.0.1:50051/org.apache.dubbo.samples.HelloWorld"
-    )
+    reference_config = ReferenceConfig.from_url("tri://127.0.0.1:50051/org.apache.dubbo.samples.HelloWorld")
     dubbo_client = dubbo.Client(reference_config)
     unary_service_stub = UnaryServiceStub(dubbo_client)
 

samples/helloworld/server.py

@@ -26,9 +26,7 @@ def say_hello(self, message: bytes) -> bytes:
 
 def build_service_handler():
     # build a method handler
-    method_handler = RpcMethodHandler.unary(
-        method=UnaryServiceServicer().say_hello, method_name="unary"
-    )
+    method_handler = RpcMethodHandler.unary(method=UnaryServiceServicer().say_hello, method_name="unary")
     # build a service handler
     service_handler = RpcServiceHandler(
         service_name="org.apache.dubbo.samples.HelloWorld",
@@ -40,9 +38,7 @@ def build_service_handler():
 if __name__ == "__main__":
     # build service config
     service_handler = build_service_handler()
-    service_config = ServiceConfig(
-        service_handler=service_handler, host="127.0.0.1", port=50051
-    )
+    service_config = ServiceConfig(service_handler=service_handler, host="127.0.0.1", port=50051)
     # start the server
     server = dubbo.Server(service_config).start()
 

samples/registry/zookeeper/client.py

@@ -35,9 +35,7 @@ def say_hello(self, request):
     registry_config = RegistryConfig.from_url("zookeeper://127.0.0.1:2181")
     bootstrap = dubbo.Dubbo(registry_config=registry_config)
 
-    reference_config = ReferenceConfig(
-        protocol="tri", service="org.apache.dubbo.samples.data.Greeter"
-    )
+    reference_config = ReferenceConfig(protocol="tri", service="org.apache.dubbo.samples.data.Greeter")
     dubbo_client = bootstrap.create_client(reference_config)
 
     stub = GreeterServiceStub(dubbo_client)

samples/serialization/json/client.py

@@ -42,9 +42,7 @@ def say_hello(self, name: str, age: int):
 
 
 if __name__ == "__main__":
-    reference_config = ReferenceConfig.from_url(
-        "tri://127.0.0.1:50051/org.apache.dubbo.samples.serialization.json"
-    )
+    reference_config = ReferenceConfig.from_url("tri://127.0.0.1:50051/org.apache.dubbo.samples.serialization.json")
     dubbo_client = dubbo.Client(reference_config)
 
     stub = GreeterServiceStub(dubbo_client)

samples/serialization/json/server.py

@@ -13,7 +13,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from typing import Tuple
 
 import orjson
 
@@ -22,7 +21,7 @@
 from dubbo.proxy.handlers import RpcMethodHandler, RpcServiceHandler
 
 
-def request_deserializer(data: bytes) -> Tuple[str, int]:
+def request_deserializer(data: bytes) -> tuple[str, int]:
     json_dict = orjson.loads(data)
     return json_dict["name"], json_dict["age"]
 
@@ -57,9 +56,7 @@ def build_service_handler():
 if __name__ == "__main__":
     # build server config
     service_handler = build_service_handler()
-    service_config = ServiceConfig(
-        service_handler=service_handler, host="127.0.0.1", port=50051
-    )
+    service_config = ServiceConfig(service_handler=service_handler, host="127.0.0.1", port=50051)
 
     # start the server
     server = dubbo.Server(service_config).start()

samples/serialization/protobuf/client.py

@@ -31,9 +31,7 @@ def say_hello(self, request):
 
 
 if __name__ == "__main__":
-    reference_config = ReferenceConfig.from_url(
-        "tri://127.0.0.1:50051/org.apache.dubbo.samples.data.Greeter"
-    )
+    reference_config = ReferenceConfig.from_url("tri://127.0.0.1:50051/org.apache.dubbo.samples.data.Greeter")
     dubbo_client = dubbo.Client(reference_config)
 
     stub = GreeterServiceStub(dubbo_client)

samples/serialization/protobuf/server.py

@@ -44,9 +44,7 @@ def build_service_handler():
 if __name__ == "__main__":
     # build a service handler
     service_handler = build_service_handler()
-    service_config = ServiceConfig(
-        service_handler=service_handler, host="127.0.0.1", port=50051
-    )
+    service_config = ServiceConfig(service_handler=service_handler, host="127.0.0.1", port=50051)
 
     # start the server
     server = dubbo.Server(service_config).start()

samples/stream/bidi_stream/client.py

@@ -34,9 +34,7 @@ def bi_stream(self, *args):
 
 if __name__ == "__main__":
     # Create a reference config
-    reference_config = ReferenceConfig.from_url(
-        "tri://127.0.0.1:50051/org.apache.dubbo.samples.data.Greeter"
-    )
+    reference_config = ReferenceConfig.from_url("tri://127.0.0.1:50051/org.apache.dubbo.samples.data.Greeter")
     dubbo_client = dubbo.Client(reference_config)
     stub = GreeterServiceStub(dubbo_client)
 

samples/stream/bidi_stream/server.py

@@ -13,13 +13,13 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+import time
+
 import dubbo
 from dubbo.configs import ServiceConfig
 from dubbo.proxy.handlers import RpcMethodHandler, RpcServiceHandler
 from samples.proto import greeter_pb2
 
-import time
-
 
 class GreeterServiceServicer:
     def bi_stream(self, stream):