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

gnetclisdk/client.py

@@ -2,6 +2,7 @@ import asyncio
 import logging
 import os.path
 import uuid
+import re
 from abc import ABC, abstractmethod
 from contextlib import asynccontextmanager
 from dataclasses import dataclass, field
@@ -190,7 +191,7 @@ class Gnetcli:
         _logger.debug("connect to %s", self._server)
         async with self._grpc_channel_fn(self._server, options=self._options) as channel:
             stub = server_pb2_grpc.GnetcliStub(channel)
-            _logger.debug("executing netconf cmd: %r", pbcmd)
+            _logger.debug("executing netconf cmd: %r", mask_password(repr(pbcmd)))
             try:
                 response = await grpc_call_wrapper(stub.ExecNetconf, pbcmd)
             except Exception as e:
@@ -344,7 +345,7 @@ class GnetcliSession(ABC):
         if not self._stream:
             raise Exception("empty self._stream")
         try:
-            _logger.debug("cmd %r on %r", str(cmdpb).replace("\n", ""), self._stream)
+            _logger.debug("cmd %r on %r", mask_password(str(cmdpb)).replace("\n", ""), self._stream)
             await self._stream.write(cmdpb)
             response: Message = await self._stream.read()
         except grpc.aio.AioRpcError as e:
@@ -420,7 +421,7 @@ async def grpc_call_wrapper(stub: grpc.UnaryUnaryMultiCallable, request: Any) ->
         metadata = [
             (HEADER_REQUEST_ID, req_id),
         ]
-        _logger.debug("executing %s: %r, req_id=%s", type(request), repr(request), req_id)
+        _logger.debug("executing %s: %r, req_id=%s", type(request), mask_password(repr(request)), req_id)
         await asyncio.sleep(i * 2)
         try:
             response = await stub(request=request, metadata=metadata)
@@ -494,6 +495,10 @@ def make_cmd(
     return res
 
 
+def mask_password(line: str) -> str:
+    return re.sub(r'password: ".+?"', "password: ...", line)
+
+
 def make_files_request(files: Dict[str, File]) -> List[server_pb2.FileData]:
     res: List[server_pb2.FileData] = []
     for path, file in files.items():

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/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.55.dist-info → gnetclisdk-1.0.57.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: gnetclisdk
-Version: 1.0.55
+Version: 1.0.57
 Summary: Client for Gnetcli GRPC-server
 Home-page: https://github.com/annetutil/gnetcli
 Author: Alexander Balezin
@@ -16,6 +16,15 @@ Description-Content-Type: text/markdown
 Requires-Dist: protobuf>=4.24.4
 Requires-Dist: grpcio>=1.59.2
 Requires-Dist: googleapis-common-protos>=1.61.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary
 
 ## Python client for Gnetcli GRPC server
 
@@ -27,13 +36,14 @@ See documentation on [gnetcli server](https://annetutil.github.io/gnetcli/).
 Example:
 
 ```python
-from gnetclisdk.client import Credentials, Gnetcli
+from gnetclisdk.client import Credentials, Gnetcli, HostParams
 import os, asyncio
 
 async def example():
     api = Gnetcli(insecure_grpc=True)
+    # api = Gnetcli(insecure_grpc=True, auth_token="Basic " + base64.b64encode(f"{username}:{password}".encode('utf-8')).decode("ascii")
     dev_creds = Credentials(os.environ.get("LOGIN"), os.environ.get("PASSWORD"))
-    res = await api.cmd(hostname="myhost", device="huawei", cmd="dis clock", credentials=dev_creds)
+    res = await api.cmd(hostname="myhost", cmd="dis clock", host_params=HostParams(device="huawei", credentials=dev_creds))
     print("err=%s status=%s out=%s" % (res.error, res.status, res.out))
 
 asyncio.run(example())

gnetclisdk-1.0.57.dist-info/RECORD

@@ -0,0 +1,11 @@
+gnetclisdk/auth.py,sha256=GwM7H7Ecb-gwqUTkQorifNB_mtnZfgeS46gOW2Vx1U4,1246
+gnetclisdk/client.py,sha256=sqmqNas7NU1Q24SQjiA_8PCW47XqxP7pJyyzhL1mL0w,18486
+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.55.dist-info → gnetclisdk-1.0.57.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

gnetclisdk-1.0.55.dist-info/RECORD

@@ -1,11 +0,0 @@
-gnetclisdk/auth.py,sha256=GwM7H7Ecb-gwqUTkQorifNB_mtnZfgeS46gOW2Vx1U4,1246
-gnetclisdk/client.py,sha256=bT5lG7g3excrz39ZexCSNg4CBKGSlgMUGLrDC3hnUgM,18325
-gnetclisdk/exceptions.py,sha256=d0Bcq8tnAzemCuCCrGJEmL_A1IQxCCLFRCwDhr9zvkU,2683
-gnetclisdk/interceptors.py,sha256=apj3l4lnR2ZcsA49odptrBC0kTDmP6Mp0EzYkeEJz9Y,7010
-gnetclisdk/proto/server_pb2.py,sha256=YL1_7wubJbSp97OeRZ_L9qJjbM2U-PMcfOg-_QpkjWs,8360
-gnetclisdk/proto/server_pb2.pyi,sha256=th-HnFVkR1ZEY-XmFmk8VMfDj_4uFAoSAXH61mSlVec,8295
-gnetclisdk/proto/server_pb2_grpc.py,sha256=rjuNEIfeqwFw99oSiWUyvNKCKPgITJZKcL8pQPbUQvM,14967
-gnetclisdk-1.0.55.dist-info/METADATA,sha256=WdrhVtsMpXWn_blU_UM-eswKsP5herYMsNUZbevAdd0,1431
-gnetclisdk-1.0.55.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-gnetclisdk-1.0.55.dist-info/top_level.txt,sha256=MNjS8LEt6d2rZ-dUbV2cnqkuTMu3EqEL2eiSvUZuUlA,11
-gnetclisdk-1.0.55.dist-info/RECORD,,