gnetclisdk 1.0.2__tar.gz → 1.0.33__tar.gz

{gnetclisdk-1.0.2 → gnetclisdk-1.0.33}/PKG-INFO

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

{gnetclisdk-1.0.2 → gnetclisdk-1.0.33}/gnetclisdk/client.py

@@ -36,16 +36,22 @@ class QA:
     question: str
     answer: str
 
+    def make_pb(self) -> server_pb2.QA:
+        pb = server_pb2.QA()
+        pb.question = self.question
+        pb.answer = self.answer
+        return pb
+
 
 @dataclass
 class Credentials:
-    login: str
-    password: str
+    login: Optional[str] = None
+    password: Optional[str] = None
 
-    def make_pb(self) -> Message:
+    def make_pb(self) -> server_pb2.Credentials:
         pb = server_pb2.Credentials()
-        pb.login = self.login
-        pb.password = self.password
+        pb.login = self.login or ""
+        pb.password = self.password or ""
         return pb
 
 
@@ -59,7 +65,22 @@ class File:
 class HostParams:
     device: str
     port: Optional[int] = None
+    hostname: Optional[str] = None
     credentials: Optional[Credentials] = None
+    ip: Optional[str] = None
+
+    def make_pb(self) -> server_pb2.HostParams:
+        creds_pb: Optional[server_pb2.Credentials] = None
+        if self.credentials:
+            creds_pb = self.credentials.make_pb()
+        pbcmd = server_pb2.HostParams(
+            host=self.hostname,
+            port=self.port,
+            credentials=creds_pb,
+            device=self.device,
+            ip=self.ip,
+        )
+        return pbcmd
 
 
 def make_auth(auth_token: str) -> ClientAuthentication:
@@ -119,7 +140,8 @@ class Gnetcli:
         qa: Optional[List[QA]] = None,
         read_timeout: float = 0.0,
         cmd_timeout: float = 0.0,
-    ) -> Message:
+        host_params: Optional[HostParams] = None,
+    ) -> server_pb2.CMDResult:
         pbcmd = make_cmd(
             hostname=hostname,
             cmd=cmd,
@@ -127,6 +149,7 @@ class Gnetcli:
             qa=qa,
             read_timeout=read_timeout,
             cmd_timeout=cmd_timeout,
+            host_params=host_params,
         )
         if self._channel is None:
             _logger.debug("connect to %s", self._server)
@@ -247,7 +270,7 @@ class GnetcliSession(ABC):
     def __init__(
         self,
         hostname: str,
-        token: str,
+        token: str | None = None,
         server: str = DEFAULT_SERVER,
         target_name_override: Optional[str] = None,
         cert_file: Optional[str] = None,
@@ -274,13 +297,17 @@ class GnetcliSession(ABC):
         cert = get_cert(cert_file=cert_file)
         channel_credentials = grpc.ssl_channel_credentials(root_certificates=cert)
         authentication: ClientAuthentication
-        if token.startswith("OAuth"):
+        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))
         else:
             raise Exception("unknown token type")
-        interceptors = get_auth_client_interceptors(authentication)
         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)
@@ -342,7 +369,8 @@ class GnetcliSessionCmd(GnetcliSession):
         qa: Optional[List[QA]] = None,
         cmd_timeout: float = 0.0,
         read_timeout: float = 0.0,
-    ) -> Message:
+        host_params: Optional[HostParams] = None,
+    ) -> server_pb2.CMDResult:
         _logger.debug("session cmd %r", cmd)
         pbcmd = make_cmd(
             hostname=self._hostname,
@@ -351,6 +379,7 @@ class GnetcliSessionCmd(GnetcliSession):
             qa=qa,
             read_timeout=read_timeout,
             cmd_timeout=cmd_timeout,
+            host_params=host_params,
         )
         return await self._cmd(pbcmd)
 
@@ -437,14 +466,15 @@ def make_cmd(
     qa: Optional[List[QA]] = None,
     read_timeout: float = 0.0,
     cmd_timeout: float = 0.0,
-) -> Message:
-    qa_cmd: List[Message] = []
+    host_params: Optional[HostParams] = None,
+) -> server_pb2.CMD:
+    qa_cmd: List[server_pb2.QA] = []
     if qa:
         for item in qa:
-            qaitem = server_pb2.QA()
-            qaitem.question = item.question
-            qaitem.answer = item.answer
-            qa_cmd.append(qaitem)
+            qa_cmd.append(item.make_pb())
+    host_params_pb: Optional[server_pb2.HostParams] = None
+    if host_params:
+        host_params_pb = host_params.make_pb()
     res = server_pb2.CMD(
         host=hostname,
         cmd=cmd,
@@ -452,8 +482,9 @@ def make_cmd(
         qa=qa_cmd,
         read_timeout=read_timeout,
         cmd_timeout=cmd_timeout,
+        host_params=host_params_pb,
     )
-    return res  # type: ignore
+    return res
 
 
 def make_files_request(files: Dict[str, File]) -> List[server_pb2.FileData]:

{gnetclisdk-1.0.2 → gnetclisdk-1.0.33}/gnetclisdk.egg-info/PKG-INFO

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

{gnetclisdk-1.0.2 → gnetclisdk-1.0.33}/setup.py

@@ -1,3 +1,4 @@
+import os
 from setuptools import setup
 
 with open("README.md") as f:
@@ -8,7 +9,7 @@ with open("requirements.txt") as f:
 
 setup(
     name="gnetclisdk",
-    version="1.0.2",
+    version=os.getenv("VERSION", "0.0").strip("v"),
     description="Client for Gnetcli GRPC-server",
     long_description=readme,
     long_description_content_type="text/markdown",