gnetclisdk 1.0.57__py3-none-any.whl → 1.0.59__py3-none-any.whl

gnetclisdk/client.py

@@ -7,7 +7,7 @@ from abc import ABC, abstractmethod
 from contextlib import asynccontextmanager
 from dataclasses import dataclass, field
 from functools import partial
-from typing import Any, AsyncIterator, List, Optional, Tuple, Dict
+from typing import Any, AsyncIterator, List, Optional, Tuple, Dict, Callable
 
 import grpc
 from google.protobuf.message import Message
@@ -200,14 +200,18 @@ class Gnetcli:
             return response
 
     @asynccontextmanager
-    async def cmd_session(self, hostname: str) -> AsyncIterator["GnetcliSessionCmd"]:
+    async def cmd_session(
+        self,
+        hostname: str,
+        host_params: Optional[HostParams] = None) -> AsyncIterator["GnetcliSessionCmd"]:
         sess = GnetcliSessionCmd(
             hostname,
             server=self._server,
+            host_params=host_params,
             channel=self._channel,
             target_name_override=self._target_name_override,
             user_agent=self._user_agent,
-            insecure_grpc=self._insecure_grpc,
+            _grpc_channel_fn=self._grpc_channel_fn,
         )
         await sess.connect()
         try:
@@ -286,6 +290,7 @@ class GnetcliSession(ABC):
         insecure_grpc: bool = False,
         channel: Optional[grpc.aio.Channel] = None,
         credentials: Optional[Credentials] = None,
+        _grpc_channel_fn: Optional[Callable] = None,
     ):
         self._hostname = hostname
         self._credentials = credentials
@@ -300,25 +305,28 @@ class GnetcliSession(ABC):
             ("grpc.max_send_message_length", GRPC_MAX_MESSAGE_LENGTH),
             ("grpc.max_receive_message_length", GRPC_MAX_MESSAGE_LENGTH),
         ]
-        if target_name_override:
-            options.append(("grpc.ssl_target_name_override", target_name_override))
-        cert = get_cert(cert_file=cert_file)
-        channel_credentials = grpc.ssl_channel_credentials(root_certificates=cert)
-        authentication: ClientAuthentication
-        interceptors: [grpc.aio.ClientInterceptor] = list()
-        if not token:
-            pass
-        elif token.startswith("OAuth"):
-            authentication = OAuthClientAuthentication(token.split(" ")[1])
-            interceptors.append(get_auth_client_interceptors(authentication))
-        elif token.startswith("Basic"):
-            authentication = BasicClientAuthentication(token.split(" ")[1])
-            interceptors.append(get_auth_client_interceptors(authentication))
+        if _grpc_channel_fn:
+            grpc_channel_fn = _grpc_channel_fn
         else:
-            raise Exception("unknown token type")
-        grpc_channel_fn = partial(grpc.aio.secure_channel, credentials=channel_credentials, interceptors=interceptors)
-        if insecure_grpc:
-            grpc_channel_fn = partial(grpc.aio.insecure_channel, interceptors=interceptors)
+            if target_name_override:
+                options.append(("grpc.ssl_target_name_override", target_name_override))
+            cert = get_cert(cert_file=cert_file)
+            channel_credentials = grpc.ssl_channel_credentials(root_certificates=cert)
+            authentication: ClientAuthentication
+            interceptors: list[grpc.aio.ClientInterceptor] = list()
+            if not token:
+                pass
+            elif token.startswith("OAuth"):
+                authentication = OAuthClientAuthentication(token.split(" ")[1])
+                interceptors.append(get_auth_client_interceptors(authentication))
+            elif token.startswith("Basic"):
+                authentication = BasicClientAuthentication(token.split(" ")[1])
+                interceptors.append(get_auth_client_interceptors(authentication))
+            else:
+                raise Exception("unknown token type")
+            grpc_channel_fn = partial(grpc.aio.secure_channel, credentials=channel_credentials, interceptors=interceptors)
+            if insecure_grpc:
+                grpc_channel_fn = partial(grpc.aio.insecure_channel, interceptors=interceptors)
         self._grpc_channel_fn = grpc_channel_fn
         self._options = options
         self._req_id: Optional[Any] = None
@@ -370,6 +378,34 @@ class GnetcliSession(ABC):
 
 
 class GnetcliSessionCmd(GnetcliSession):
+    def __init__(
+            self,
+            hostname: str,
+            token: str | None = None,
+            server: str = DEFAULT_SERVER,
+            target_name_override: Optional[str] = None,
+            cert_file: Optional[str] = None,
+            user_agent: str = DEFAULT_USER_AGENT,
+            insecure_grpc: bool = False,
+            channel: Optional[grpc.aio.Channel] = None,
+            credentials: Optional[Credentials] = None,
+            host_params: Optional[HostParams] = None,
+            _grpc_channel_fn: Optional[Callable] = None,
+    ):
+        super(GnetcliSessionCmd, self).__init__(
+            hostname,
+            token,
+            server,
+            target_name_override,
+            cert_file,
+            user_agent,
+            insecure_grpc,
+            channel,
+            credentials,
+            _grpc_channel_fn,
+        )
+        self.host_params = host_params
+
     async def cmd(
         self,
         cmd: str,
@@ -387,7 +423,7 @@ class GnetcliSessionCmd(GnetcliSession):
             qa=qa,
             read_timeout=read_timeout,
             cmd_timeout=cmd_timeout,
-            host_params=host_params,
+            host_params=host_params if host_params else self.host_params,
         )
         return await self._cmd(pbcmd)
 

{gnetclisdk-1.0.57.dist-info → gnetclisdk-1.0.59.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: gnetclisdk
-Version: 1.0.57
+Version: 1.0.59
 Summary: Client for Gnetcli GRPC-server
 Home-page: https://github.com/annetutil/gnetcli
 Author: Alexander Balezin

{gnetclisdk-1.0.57.dist-info → gnetclisdk-1.0.59.dist-info}/RECORD

@@ -1,11 +1,11 @@
 gnetclisdk/auth.py,sha256=GwM7H7Ecb-gwqUTkQorifNB_mtnZfgeS46gOW2Vx1U4,1246
-gnetclisdk/client.py,sha256=sqmqNas7NU1Q24SQjiA_8PCW47XqxP7pJyyzhL1mL0w,18486
+gnetclisdk/client.py,sha256=VjbXL11xAUYRX5e6tnedTt6X7_lvvhysYm04EFbhtl8,19773
 gnetclisdk/exceptions.py,sha256=d0Bcq8tnAzemCuCCrGJEmL_A1IQxCCLFRCwDhr9zvkU,2683
 gnetclisdk/interceptors.py,sha256=apj3l4lnR2ZcsA49odptrBC0kTDmP6Mp0EzYkeEJz9Y,7010
 gnetclisdk/proto/server_pb2.py,sha256=OQsW6Oh38zf-h1ctcNyeOyxjl5wzWm_D9SRT2Usx5q4,8083
 gnetclisdk/proto/server_pb2.pyi,sha256=th-HnFVkR1ZEY-XmFmk8VMfDj_4uFAoSAXH61mSlVec,8295
 gnetclisdk/proto/server_pb2_grpc.py,sha256=H_CmevWcjvGTvp4TmzEV-TJRPq2SsQ6UgoCDc-hosyo,12805
-gnetclisdk-1.0.57.dist-info/METADATA,sha256=IkhRQT42qLY_nZqtrfn26evXM6tpGTs2qKviAPy_p2I,1793
-gnetclisdk-1.0.57.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-gnetclisdk-1.0.57.dist-info/top_level.txt,sha256=MNjS8LEt6d2rZ-dUbV2cnqkuTMu3EqEL2eiSvUZuUlA,11
-gnetclisdk-1.0.57.dist-info/RECORD,,
+gnetclisdk-1.0.59.dist-info/METADATA,sha256=eZB1bNIeSnB2X8d_9f8_0Mwh3fEB1jrWvXR8TRtkXmE,1793
+gnetclisdk-1.0.59.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+gnetclisdk-1.0.59.dist-info/top_level.txt,sha256=MNjS8LEt6d2rZ-dUbV2cnqkuTMu3EqEL2eiSvUZuUlA,11
+gnetclisdk-1.0.59.dist-info/RECORD,,