tilebox-grpc 0.37.0__py3-none-any.whl → 0.37.1__py3-none-any.whl

_tilebox/grpc/aio/channel.py

@@ -1,8 +1,8 @@
 from collections.abc import Callable, Sequence
 from typing import TypeVar
 
-from _tilebox.grpc.channel import CHANNEL_OPTIONS, ChannelInfo, add_metadata, parse_channel_info
-from grpc import ssl_channel_credentials
+from _tilebox.grpc.channel import CHANNEL_OPTIONS, ChannelInfo, ChannelProtocol, add_metadata, parse_channel_info
+from grpc import Compression, ssl_channel_credentials
 from grpc.aio import (
     Channel,
     ClientCallDetails,
@@ -34,11 +34,28 @@ def open_channel(url: str, auth_token: str | None = None) -> Channel:
 
 
 def _open_channel(channel_info: ChannelInfo, interceptors: Sequence[ClientInterceptor]) -> Channel:
-    if channel_info.use_ssl:
-        return secure_channel(
-            channel_info.url_without_protocol, ssl_channel_credentials(), CHANNEL_OPTIONS, interceptors=interceptors
-        )
-    return insecure_channel(channel_info.url_without_protocol, CHANNEL_OPTIONS, interceptors=interceptors)
+    match channel_info.protocol:
+        case ChannelProtocol.HTTPS:
+            return secure_channel(
+                f"{channel_info.address}:{channel_info.port}",
+                ssl_channel_credentials(),
+                CHANNEL_OPTIONS,
+                compression=Compression.Gzip,
+                interceptors=interceptors,
+            )
+        case ChannelProtocol.HTTP:
+            return insecure_channel(
+                f"{channel_info.address}:{channel_info.port}",
+                CHANNEL_OPTIONS,
+                compression=Compression.NoCompression,
+                interceptors=interceptors,
+            )
+        case ChannelProtocol.UNIX:
+            return insecure_channel(
+                channel_info.address, CHANNEL_OPTIONS, compression=Compression.NoCompression, interceptors=interceptors
+            )
+        case _:
+            raise ValueError(f"Unsupported channel protocol: {channel_info.protocol}")
 
 
 RequestType = TypeVar("RequestType")

_tilebox/grpc/channel.py

@@ -2,6 +2,7 @@ import json
 import re
 from collections.abc import Callable
 from dataclasses import dataclass
+from enum import Enum
 from typing import TypeVar
 
 from grpc import (
@@ -43,10 +44,21 @@ CHANNEL_OPTIONS = [
 ]
 
 
+class ChannelProtocol(Enum):
+    HTTPS = 1
+    HTTP = 2
+    UNIX = 3
+
+
 @dataclass
 class ChannelInfo:
-    url_without_protocol: str
-    use_ssl: bool
+    address: str
+    """GRPC target address. For http(s) connections this is the host[:port] format without a scheme. For unix sockets
+    this is the unix socket path including the `unix://` prefix for absolute paths or `unix:` for relative paths."""
+    port: int
+    """Port number for http(s) connections. For unix sockets this is always 0."""
+    protocol: ChannelProtocol
+    """The protocol to use for the channel."""
 
 
 def open_channel(url: str, auth_token: str | None = None) -> Channel:
@@ -69,14 +81,22 @@ def open_channel(url: str, auth_token: str | None = None) -> Channel:
 
 
 def _open_channel(channel_info: ChannelInfo) -> Channel:
-    if channel_info.use_ssl:
-        return secure_channel(
-            channel_info.url_without_protocol,
-            ssl_channel_credentials(),
-            CHANNEL_OPTIONS,
-            compression=Compression.Gzip,
-        )
-    return insecure_channel(channel_info.url_without_protocol, CHANNEL_OPTIONS, compression=Compression.NoCompression)
+    match channel_info.protocol:
+        case ChannelProtocol.HTTPS:
+            return secure_channel(
+                f"{channel_info.address}:{channel_info.port}",
+                ssl_channel_credentials(),
+                CHANNEL_OPTIONS,
+                compression=Compression.Gzip,
+            )
+        case ChannelProtocol.HTTP:
+            return insecure_channel(
+                f"{channel_info.address}:{channel_info.port}", CHANNEL_OPTIONS, compression=Compression.NoCompression
+            )
+        case ChannelProtocol.UNIX:
+            return insecure_channel(channel_info.address, CHANNEL_OPTIONS, compression=Compression.NoCompression)
+        case _:
+            raise ValueError(f"Unsupported channel protocol: {channel_info.protocol}")
 
 
 _URL_SCHEME = re.compile(r"^(https?://)?([^: ]+)(:\d+)?/?$")
@@ -98,27 +118,28 @@ def parse_channel_info(url: str) -> ChannelInfo:
         A ChannelInfo object that can be used to create a gRPC channel.
     """
     # See https://github.com/grpc/grpc/blob/master/doc/naming.md
-    if url.startswith("unix:"):
-        return ChannelInfo(url, False)
+    if url.startswith("unix:"):  ## unix:///absolute/path or unix://path
+        return ChannelInfo(url, 0, ChannelProtocol.UNIX)
 
     # `urllib.parse.urlparse` behaves a bit weird with URLs that don't have a scheme but a port number, so regex it is
     if (match := _URL_SCHEME.match(url)) is None:
         raise ValueError(f"Invalid URL: {url}")
     scheme, netloc, port = match.groups()
     netloc = netloc.rstrip("/")
-    use_ssl = True
+    protocol = ChannelProtocol.HTTPS
 
     if scheme == "http://":  # explicitly set http -> require a port
         if port is None:
             raise ValueError("Explicit port required for insecure HTTP channel")
-        use_ssl = False
+        protocol = ChannelProtocol.HTTP
+
+    # no scheme, but a port that looks like a dev port -> insecure
+    if scheme is None and port is not None and port != ":443":
+        protocol = ChannelProtocol.HTTP
 
-    if scheme is None and port is not None:  # no scheme, but a port that looks like a dev port -> insecure
-        use_ssl = port == ":443"
+    port_number = 443 if port is None else int(port.removeprefix(":"))
 
-    if use_ssl:
-        return ChannelInfo(netloc + (port or ":443"), True)
-    return ChannelInfo(netloc + port, False)
+    return ChannelInfo(netloc, port_number, protocol)
 
 
 RequestType = TypeVar("RequestType")

{tilebox_grpc-0.37.0.dist-info → tilebox_grpc-0.37.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tilebox-grpc
-Version: 0.37.0
+Version: 0.37.1
 Summary: GRPC / Protocol Buffers functions for Tilebox
 Project-URL: Homepage, https://tilebox.com
 Project-URL: Documentation, https://docs.tilebox.com/

{tilebox_grpc-0.37.0.dist-info → tilebox_grpc-0.37.1.dist-info}/RECORD

@@ -1,15 +1,15 @@
 _tilebox/grpc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-_tilebox/grpc/channel.py,sha256=2uBAHcmKdGCzqVHhTsISAVirI9bQxXNfbC4GGM6RyHM,5332
+_tilebox/grpc/channel.py,sha256=e0Dyn1GqgJScHcwMfNKwfLa1VPalHp_B3li3IEoKmoc,6342
 _tilebox/grpc/error.py,sha256=QVfLuvitYLlhWENE98zdb4m9gx0PGMsR6m1_prwkwj4,3598
 _tilebox/grpc/pagination.py,sha256=-KhkhQ_0IE-BgzjNAmkPac7fH55ZGICstaqRhCLvHGE,1292
 _tilebox/grpc/producer_consumer.py,sha256=NG6gUCcvYOGbplV1Vq9bFro-4cNpTHvT7eL4zlNDkkA,2154
 _tilebox/grpc/replay.py,sha256=_NC76BfmvazNrJI5MovSnPTC7kYwWZn3Au_0yPlOLsc,6006
 _tilebox/grpc/aio/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-_tilebox/grpc/aio/channel.py,sha256=6wWtR4h4ASDYOgAPXP0o_o3h0YEnzonwwwFI6d-5AZY,2305
+_tilebox/grpc/aio/channel.py,sha256=H6poWZT4jn62kHsSdCrkW85t8fGLlbzwGJr8Y6-aVN8,2976
 _tilebox/grpc/aio/error.py,sha256=Lkf20vuQn9XaLj0MlQ1uqHRaenhYJ_P3rggNZyDMML8,1222
 _tilebox/grpc/aio/pagination.py,sha256=6v95yqgC-m87kD96pjfpIsmY41YuxxR0Se1o3NTrkSs,1115
 _tilebox/grpc/aio/producer_consumer.py,sha256=aOZhZHD74GZEvfeZ9OzUsVk5uUIuuMQp1V7l3Y1PQ0w,2679
 _tilebox/grpc/aio/syncify.py,sha256=jhScVqEwsoNP6gLwJpnIIaBqMC3q4XqSkEfIPokYG8c,4035
-tilebox_grpc-0.37.0.dist-info/METADATA,sha256=_9ZN4eowxbu6qhKmMMcpdJHXEtT3eEYfGK6HxRA7aFY,2955
-tilebox_grpc-0.37.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-tilebox_grpc-0.37.0.dist-info/RECORD,,
+tilebox_grpc-0.37.1.dist-info/METADATA,sha256=jzqwpuLkmbsQWcKuPF8RsGAex-MAlTlL3noFctQFU58,2955
+tilebox_grpc-0.37.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+tilebox_grpc-0.37.1.dist-info/RECORD,,