gnetclisdk 1.0.56__tar.gz → 1.0.58__tar.gz

{gnetclisdk-1.0.56 → gnetclisdk-1.0.58}/PKG-INFO

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

{gnetclisdk-1.0.56 → gnetclisdk-1.0.58}/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
@@ -207,7 +207,7 @@ class Gnetcli:
             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 +286,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 +301,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

{gnetclisdk-1.0.56 → gnetclisdk-1.0.58}/gnetclisdk/proto/server_pb2.py

@@ -1,22 +1,12 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# NO CHECKED-IN PROTOBUF GENCODE
 # source: server.proto
-# Protobuf Python Version: 5.27.2
+# Protobuf Python Version: 4.25.1
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import runtime_version as _runtime_version
 from google.protobuf import symbol_database as _symbol_database
 from google.protobuf.internal import builder as _builder
-_runtime_version.ValidateProtobufRuntimeVersion(
-    _runtime_version.Domain.PUBLIC,
-    5,
-    27,
-    2,
-    '',
-    'server.proto'
-)
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -31,20 +21,20 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0cserver.proto\x
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'server_pb2', _globals)
-if not _descriptor._USE_C_DESCRIPTORS:
-  _globals['DESCRIPTOR']._loaded_options = None
+if _descriptor._USE_C_DESCRIPTORS == False:
+  _globals['DESCRIPTOR']._options = None
   _globals['DESCRIPTOR']._serialized_options = b'Z5github.com/annetutil/gnetcli/pkg/server/proto;gnetcli'
-  _globals['_GNETCLI'].methods_by_name['SetupHostParams']._loaded_options = None
+  _globals['_GNETCLI'].methods_by_name['SetupHostParams']._options = None
   _globals['_GNETCLI'].methods_by_name['SetupHostParams']._serialized_options = b'\202\323\344\223\002\036\"\031/api/v1/setup_host_params:\001*'
-  _globals['_GNETCLI'].methods_by_name['Exec']._loaded_options = None
+  _globals['_GNETCLI'].methods_by_name['Exec']._options = None
   _globals['_GNETCLI'].methods_by_name['Exec']._serialized_options = b'\202\323\344\223\002\021\"\014/api/v1/exec:\001*'
-  _globals['_GNETCLI'].methods_by_name['AddDevice']._loaded_options = None
+  _globals['_GNETCLI'].methods_by_name['AddDevice']._options = None
   _globals['_GNETCLI'].methods_by_name['AddDevice']._serialized_options = b'\202\323\344\223\002\027\"\022/api/v1/add_device:\001*'
-  _globals['_GNETCLI'].methods_by_name['ExecNetconf']._loaded_options = None
+  _globals['_GNETCLI'].methods_by_name['ExecNetconf']._options = None
   _globals['_GNETCLI'].methods_by_name['ExecNetconf']._serialized_options = b'\202\323\344\223\002\031\"\024/api/v1/exec_netconf:\001*'
-  _globals['_GNETCLI'].methods_by_name['Download']._loaded_options = None
+  _globals['_GNETCLI'].methods_by_name['Download']._options = None
   _globals['_GNETCLI'].methods_by_name['Download']._serialized_options = b'\202\323\344\223\002\026\"\021/api/v1/downloads:\001*'
-  _globals['_GNETCLI'].methods_by_name['Upload']._loaded_options = None
+  _globals['_GNETCLI'].methods_by_name['Upload']._options = None
   _globals['_GNETCLI'].methods_by_name['Upload']._serialized_options = b'\202\323\344\223\002\023\"\016/api/v1/upload:\001*'
   _globals['_TRACEOPERATION']._serialized_start=1311
   _globals['_TRACEOPERATION']._serialized_end=1413

{gnetclisdk-1.0.56 → gnetclisdk-1.0.58}/gnetclisdk/proto/server_pb2_grpc.py

@@ -1,30 +1,10 @@
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
-import warnings
 
 from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
 from . import server_pb2 as server__pb2
 
-GRPC_GENERATED_VERSION = '1.66.1'
-GRPC_VERSION = grpc.__version__
-_version_not_supported = False
-
-try:
-    from grpc._utilities import first_version_is_lower
-    _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
-except ImportError:
-    _version_not_supported = True
-
-if _version_not_supported:
-    raise RuntimeError(
-        f'The grpc package installed is at version {GRPC_VERSION},'
-        + f' but the generated code in server_pb2_grpc.py depends on'
-        + f' grpcio>={GRPC_GENERATED_VERSION}.'
-        + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
-        + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
-    )
-
 
 class GnetcliStub(object):
     """Missing associated documentation comment in .proto file."""
@@ -39,42 +19,42 @@ class GnetcliStub(object):
                 '/gnetcli.Gnetcli/SetupHostParams',
                 request_serializer=server__pb2.HostParams.SerializeToString,
                 response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
-                _registered_method=True)
+                )
         self.Exec = channel.unary_unary(
                 '/gnetcli.Gnetcli/Exec',
                 request_serializer=server__pb2.CMD.SerializeToString,
                 response_deserializer=server__pb2.CMDResult.FromString,
-                _registered_method=True)
+                )
         self.ExecChat = channel.stream_stream(
                 '/gnetcli.Gnetcli/ExecChat',
                 request_serializer=server__pb2.CMD.SerializeToString,
                 response_deserializer=server__pb2.CMDResult.FromString,
-                _registered_method=True)
+                )
         self.AddDevice = channel.unary_unary(
                 '/gnetcli.Gnetcli/AddDevice',
                 request_serializer=server__pb2.Device.SerializeToString,
                 response_deserializer=server__pb2.DeviceResult.FromString,
-                _registered_method=True)
+                )
         self.ExecNetconf = channel.unary_unary(
                 '/gnetcli.Gnetcli/ExecNetconf',
                 request_serializer=server__pb2.CMDNetconf.SerializeToString,
                 response_deserializer=server__pb2.CMDResult.FromString,
-                _registered_method=True)
+                )
         self.ExecNetconfChat = channel.stream_stream(
                 '/gnetcli.Gnetcli/ExecNetconfChat',
                 request_serializer=server__pb2.CMDNetconf.SerializeToString,
                 response_deserializer=server__pb2.CMDResult.FromString,
-                _registered_method=True)
+                )
         self.Download = channel.unary_unary(
                 '/gnetcli.Gnetcli/Download',
                 request_serializer=server__pb2.FileDownloadRequest.SerializeToString,
                 response_deserializer=server__pb2.FilesResult.FromString,
-                _registered_method=True)
+                )
         self.Upload = channel.unary_unary(
                 '/gnetcli.Gnetcli/Upload',
                 request_serializer=server__pb2.FileUploadRequest.SerializeToString,
                 response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
-                _registered_method=True)
+                )
 
 
 class GnetcliServicer(object):
@@ -175,7 +155,6 @@ def add_GnetcliServicer_to_server(servicer, server):
     generic_handler = grpc.method_handlers_generic_handler(
             'gnetcli.Gnetcli', rpc_method_handlers)
     server.add_generic_rpc_handlers((generic_handler,))
-    server.add_registered_method_handlers('gnetcli.Gnetcli', rpc_method_handlers)
 
 
  # This class is part of an EXPERIMENTAL API.
@@ -193,21 +172,11 @@ class Gnetcli(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/gnetcli.Gnetcli/SetupHostParams',
+        return grpc.experimental.unary_unary(request, target, '/gnetcli.Gnetcli/SetupHostParams',
             server__pb2.HostParams.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
     @staticmethod
     def Exec(request,
@@ -220,21 +189,11 @@ class Gnetcli(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/gnetcli.Gnetcli/Exec',
+        return grpc.experimental.unary_unary(request, target, '/gnetcli.Gnetcli/Exec',
             server__pb2.CMD.SerializeToString,
             server__pb2.CMDResult.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
     @staticmethod
     def ExecChat(request_iterator,
@@ -247,21 +206,11 @@ class Gnetcli(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.stream_stream(
-            request_iterator,
-            target,
-            '/gnetcli.Gnetcli/ExecChat',
+        return grpc.experimental.stream_stream(request_iterator, target, '/gnetcli.Gnetcli/ExecChat',
             server__pb2.CMD.SerializeToString,
             server__pb2.CMDResult.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
     @staticmethod
     def AddDevice(request,
@@ -274,21 +223,11 @@ class Gnetcli(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/gnetcli.Gnetcli/AddDevice',
+        return grpc.experimental.unary_unary(request, target, '/gnetcli.Gnetcli/AddDevice',
             server__pb2.Device.SerializeToString,
             server__pb2.DeviceResult.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
     @staticmethod
     def ExecNetconf(request,
@@ -301,21 +240,11 @@ class Gnetcli(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/gnetcli.Gnetcli/ExecNetconf',
+        return grpc.experimental.unary_unary(request, target, '/gnetcli.Gnetcli/ExecNetconf',
             server__pb2.CMDNetconf.SerializeToString,
             server__pb2.CMDResult.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
     @staticmethod
     def ExecNetconfChat(request_iterator,
@@ -328,21 +257,11 @@ class Gnetcli(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.stream_stream(
-            request_iterator,
-            target,
-            '/gnetcli.Gnetcli/ExecNetconfChat',
+        return grpc.experimental.stream_stream(request_iterator, target, '/gnetcli.Gnetcli/ExecNetconfChat',
             server__pb2.CMDNetconf.SerializeToString,
             server__pb2.CMDResult.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
     @staticmethod
     def Download(request,
@@ -355,21 +274,11 @@ class Gnetcli(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/gnetcli.Gnetcli/Download',
+        return grpc.experimental.unary_unary(request, target, '/gnetcli.Gnetcli/Download',
             server__pb2.FileDownloadRequest.SerializeToString,
             server__pb2.FilesResult.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
     @staticmethod
     def Upload(request,
@@ -382,18 +291,8 @@ class Gnetcli(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/gnetcli.Gnetcli/Upload',
+        return grpc.experimental.unary_unary(request, target, '/gnetcli.Gnetcli/Upload',
             server__pb2.FileUploadRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)

{gnetclisdk-1.0.56 → gnetclisdk-1.0.58}/gnetclisdk.egg-info/PKG-INFO

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