Merge branch 'Feature-10361' into 'main'

Feature 10361

See merge request !4

node/cli.py

-from typing import Callable, Protocol
+from typing import Callable, Protocol, NewType
 
 import traceback
 from CellFrame import AppCliServer
 from DAP.Core import logIt
 from optparse import OptionParser
-from pycfhelpers.node.types import ReplyId
+
+ReplyId = NewType("ReplyId", int)
 
 
 class ReplyObject:

node/http/simple.py

-
 from DAP.Core import AppContext
 from DAP.Network import Server, HttpSimple, HttpCode
 from pycfhelpers.node.logging import CFLog
@@ -7,38 +6,38 @@ from typing import Callable
 
 HTTP_REPLY_SIZE_MAX = 10 * 1024 * 1024
 
+
 class CFSimpleHTTPRequest:
     def __init__(self, http: HttpSimple):
         self.http = http
-    
+
     @property
     def query(self):
         return self.http.query
-    
+
     @property
     def url(self):
         return self.http.urlPath
-    
-    property
+
+    @property
     def method(self):
         return self.http.action
 
-    property
+    @property
     def body(self):
         return self.http.request
 
     @property
     def client_address(self):
         return self.http.ipClient
-    
 
-class CFSimpleHTTPRequestHandler:
 
-    def __init__(self, methods: list[str], handler : Callable [[CFSimpleHTTPRequest], tuple[bytes, int]]):
+class CFSimpleHTTPRequestHandler:
+    def __init__(self, methods: list[str], handler: Callable[[CFSimpleHTTPRequest], tuple[bytes, int]]):
         self.handler = handler
         self.methods = methods
 
-    def __call__(self, http : HttpSimple, response_code: HttpCode):
+    def __call__(self, http: HttpSimple, response_code: HttpCode):
         if http.action in self.methods:
             res, code = self.handler(CFSimpleHTTPRequest(http))
             http.replyAdd(res)
@@ -47,18 +46,18 @@ class CFSimpleHTTPRequestHandler:
             CFLog.notice(f"Method {http.action} not supported for {http.urlPath} ")
             response_code.set(405)
 
+
 class CFSimpleHTTPServer:
     def __init__(self):
         self._sc = Server()
         AppContext.getServer(self._sc)
-    
+
     def register_uri_handler(self, uri: str, handler: CFSimpleHTTPRequestHandler):
         HttpSimple.addProc(self._sc, uri, HTTP_REPLY_SIZE_MAX, handler)
-    
+
     @staticmethod
-    def handler(uri: str, methods : list[str] = ["GET",], **kwargs):      
+    def handler(uri: str, methods: list[str] = ("GET",), **kwargs):
         def wrapper(func):
             CFSimpleHTTPServer().register_uri_handler(uri, CFSimpleHTTPRequestHandler(methods=methods, handler=func))
-        return wrapper
-        
 
+        return wrapper

node/logging.py

 from DAP.Core import logIt
 
+
 class CFLog:
     def __init__(self):
         self._logger = logIt
@@ -30,18 +31,3 @@ class CFLog:
 
     def critical(self, message: str):
         self._logger.critical(message)
-
-    def dap(self, message: str):
-        self._logger.dap(message)
-
-    def warning(self, message: str):
-        self._logger.warning(message)
-
-    def att(self, message: str):
-        self._logger.att(message)
-
-    def error(self, message: str):
-        self._logger.error(message)
-
-    def critical(self, message: str):
-        self._logger.critical(message)
\ No newline at end of file

node/net.py

-from typing import Iterator, Callable, Self
+from typing import Iterator, Callable
 
 import traceback
 
@@ -26,22 +26,21 @@ class NetFee:
 
 
 class CFNet:
-
-    @staticmethod
-    def active_nets() -> list[Self]:
-        return [CFNet(n.getName()) for n in Net.getNets()]
-
     def __init__(self, name: str):
         self.name = name
         self._origin_net = Net.byName(name)
         if not self._origin_net:
             raise RuntimeError(f"No such net: {name}")
-        
+
         self.main = CFChain(self, 'main')
         self.zerochain = CFChain(self, 'zerochain')
 
         self.fee_data = NetFee(self)
 
+    @staticmethod
+    def active_nets() -> list['CFNet']:
+        return [CFNet(n.getName()) for n in Net.getNets()]
+
     @property
     def id(self) -> int:
         return self._origin_net.id.long()