wnm 0.0.8__py3-none-any.whl → 0.0.9__py3-none-any.whl

wnm/models.py

@@ -1,20 +1,34 @@
-import json_fix
-
 # Turn a class into a storable object with ORM
 from typing import Optional
-from sqlalchemy import Integer, Unicode, UnicodeText, Float
-from sqlalchemy import create_engine, select, insert, update
-from sqlalchemy.orm import sessionmaker, scoped_session
-from sqlalchemy.orm import DeclarativeBase
-from sqlalchemy.orm import Mapped, mapped_column
+
+import json_fix
+from sqlalchemy import (
+    Float,
+    Integer,
+    Unicode,
+    UnicodeText,
+    create_engine,
+    insert,
+    select,
+    update,
+)
+from sqlalchemy.orm import (
+    DeclarativeBase,
+    Mapped,
+    mapped_column,
+    scoped_session,
+    sessionmaker,
+)
+
 
 # create a Base class bound to sqlalchemy
 class Base(DeclarativeBase):
     pass
 
+
 # Extend the Base class to create our Host info
 class Machine(Base):
-    __tablename__ = 'machine'
+    __tablename__ = "machine"
     # No schema in sqlite3
     # __table_args__ = {"schema": "colony"}
     id: Mapped[int] = mapped_column(Integer, primary_key=True)
@@ -46,15 +60,36 @@ class Machine(Base):
     NetIOWriteRemove: Mapped[float] = mapped_column(Float)
     LastStoppedAt: Mapped[int] = mapped_column(Integer)
 
-    def __init__(self, CpuCount, NodeCap, CpuLessThan, CpuRemove,
-                 MemLessThan, MemRemove, HDLessThan, HDRemove,
-                 DelayStart, DelayUpgrade, DelayRemove, NodeStorage,
-                 RewardsAddress, DonateAddress, MaxLoadAverageAllowed, 
-                 DesiredLoadAverage, PortStart, HDIOReadLessThan, 
-                 HDIOReadRemove, HDIOWriteLessThan, HDIOWriteRemove, 
-                 NetIOReadLessThan, NetIOReadRemove, NetIOWriteLessThan, 
-                 NetIOWriteRemove, LastStoppedAt):
-        
+    def __init__(
+        self,
+        CpuCount,
+        NodeCap,
+        CpuLessThan,
+        CpuRemove,
+        MemLessThan,
+        MemRemove,
+        HDLessThan,
+        HDRemove,
+        DelayStart,
+        DelayUpgrade,
+        DelayRemove,
+        NodeStorage,
+        RewardsAddress,
+        DonateAddress,
+        MaxLoadAverageAllowed,
+        DesiredLoadAverage,
+        PortStart,
+        HDIOReadLessThan,
+        HDIOReadRemove,
+        HDIOWriteLessThan,
+        HDIOWriteRemove,
+        NetIOReadLessThan,
+        NetIOReadRemove,
+        NetIOWriteLessThan,
+        NetIOWriteRemove,
+        LastStoppedAt,
+    ):
+
         self.CpuCount = CpuCount
         self.NodeCap = NodeCap
         self.CpuLessThan = CpuLessThan
@@ -83,37 +118,56 @@ class Machine(Base):
         self.LastStoppedAt = LastStoppedAt
 
     def __repr__(self):
-        return f'Machine({self.CpuCount},{self.NodeCap},{self.CpuLessThan},{self.CpuRemove}' + \
-            f',{self.MemLessThan},{self.MemRemove},{self.HDLessThan}' + \
-            f',{self.HDRemove},{self.DelayStart},{self.DelayUpgrade}' + \
-            f',{self.DelayRemove}' + \
-            f',"{self.NodeStorage}","{self.RewardsAddress}","{self.DonateAddress}"' + \
-            f',{self.MaxLoadAverageAllowed},{self.DesiredLoadAverage}' + \
-            f',{self.PortStart},{self.HDIOReadLessThan},{self.HDIOReadRemove}' + \
-            f',{self.HDIOWriteLessThan},{self.HDIOWriteRemove}' + \
-            f',{self.NetIOReadLessThan},{self.NetIOReadRemove}' + \
-            f',{self.NetIOWriteLessThan},{self.NetIOWriteRemove}' + \
-            f',{self.LastStoppedAt})'
-    
+        return (
+            f"Machine({self.CpuCount},{self.NodeCap},{self.CpuLessThan},{self.CpuRemove}"
+            + f",{self.MemLessThan},{self.MemRemove},{self.HDLessThan}"
+            + f",{self.HDRemove},{self.DelayStart},{self.DelayUpgrade}"
+            + f",{self.DelayRemove}"
+            + f',"{self.NodeStorage}","{self.RewardsAddress}","{self.DonateAddress}"'
+            + f",{self.MaxLoadAverageAllowed},{self.DesiredLoadAverage}"
+            + f",{self.PortStart},{self.HDIOReadLessThan},{self.HDIOReadRemove}"
+            + f",{self.HDIOWriteLessThan},{self.HDIOWriteRemove}"
+            + f",{self.NetIOReadLessThan},{self.NetIOReadRemove}"
+            + f",{self.NetIOWriteLessThan},{self.NetIOWriteRemove}"
+            + f",{self.LastStoppedAt})"
+        )
+
     def __json__(self):
-        return { 'CpuCount': self.CpuCount, 'NodeCap': self.NodeCap, 'CpuLessThan': self.CpuLessThan,
-            'CpuRemove': self.CpuRemove, 'MemLessThan': self.MemLessThan, 'MemRemove': self.MemRemove,
-            'HDLessThan': self.HDLessThan, 'HDRemove': self.HDRemove, 'DelayStart': self.DelayStart,
-            'DelayUpgrade': self.DelayUpgrade, 'DelayRemove': self.DelayRemove, 'NodeStorage': f"{self.NodeStorage}",
-            'RewardsAddress': f"{self.RewardsAddress}", 'DonateAddress': f"{self.DonateAddress}",
-            'MaxLoadAverageAllowed': self.MaxLoadAverageAllowed, 'DesiredLoadAverage': self.DesiredLoadAverage,
-            'PortStart': self.PortStart, 'HDIOReadLessThan': self.HDIOReadLessThan, 'HDIOReadRemove': self.HDIOReadRemove,
-            'HDIOWriteLessThan': self.HDIOWriteLessThan, 'HDIOWriteRemove': self.HDIOWriteRemove,
-            'NetIOReadLessThan': self.NetIOReadLessThan, 'NetIOReadRemove': self.NetIOReadRemove,
-            'NetIOWriteLessThan': self.NetIOWriteLessThan, 'NetIOWriteRemove': self.NetIOWriteRemove,
-            'LastStoppedAt': self.LastStoppedAt }
+        return {
+            "CpuCount": self.CpuCount,
+            "NodeCap": self.NodeCap,
+            "CpuLessThan": self.CpuLessThan,
+            "CpuRemove": self.CpuRemove,
+            "MemLessThan": self.MemLessThan,
+            "MemRemove": self.MemRemove,
+            "HDLessThan": self.HDLessThan,
+            "HDRemove": self.HDRemove,
+            "DelayStart": self.DelayStart,
+            "DelayUpgrade": self.DelayUpgrade,
+            "DelayRemove": self.DelayRemove,
+            "NodeStorage": f"{self.NodeStorage}",
+            "RewardsAddress": f"{self.RewardsAddress}",
+            "DonateAddress": f"{self.DonateAddress}",
+            "MaxLoadAverageAllowed": self.MaxLoadAverageAllowed,
+            "DesiredLoadAverage": self.DesiredLoadAverage,
+            "PortStart": self.PortStart,
+            "HDIOReadLessThan": self.HDIOReadLessThan,
+            "HDIOReadRemove": self.HDIOReadRemove,
+            "HDIOWriteLessThan": self.HDIOWriteLessThan,
+            "HDIOWriteRemove": self.HDIOWriteRemove,
+            "NetIOReadLessThan": self.NetIOReadLessThan,
+            "NetIOReadRemove": self.NetIOReadRemove,
+            "NetIOWriteLessThan": self.NetIOWriteLessThan,
+            "NetIOWriteRemove": self.NetIOWriteRemove,
+            "LastStoppedAt": self.LastStoppedAt,
+        }
+
 
-   
 # Extend the Base class to create our Node info
 class Node(Base):
-    __tablename__ = 'node'
+    __tablename__ = "node"
     # No schema in sqlite3
-    #__table_args__ = {"schema": "colony"}
+    # __table_args__ = {"schema": "colony"}
     id: Mapped[int] = mapped_column(Integer, primary_key=True)
     # Maps to antnode-{nodename}
     nodename: Mapped[str] = mapped_column(Unicode(10))
@@ -134,15 +188,15 @@ class Node(Base):
     # Network to use ( Live is evm-arbitrum-one )
     network: Mapped[str] = mapped_column(UnicodeText)
     # Reward address
-    wallet: Mapped[Optional[str]] = mapped_column(Unicode(42),index=True)
+    wallet: Mapped[Optional[str]] = mapped_column(Unicode(42), index=True)
     # Reported peer_id
     peer_id: Mapped[Optional[str]] = mapped_column(Unicode(52))
     # Node's last probed status
-    status: Mapped[str] = mapped_column(Unicode(32),index=True)
+    status: Mapped[str] = mapped_column(Unicode(32), index=True)
     # Timestamp of last update
-    timestamp: Mapped[int] = mapped_column(Integer,index=True)
+    timestamp: Mapped[int] = mapped_column(Integer, index=True)
     # Number of node records stored as reported by node
-    records: Mapped[int] = mapped_column(Integer,index=True)
+    records: Mapped[int] = mapped_column(Integer, index=True)
     # Node reported uptime
     uptime: Mapped[int] = mapped_column(Integer)
     # Number of shuns
@@ -152,10 +206,28 @@ class Node(Base):
     # Host ip/name for data and metrics ports
     host: Mapped[Optional[str]] = mapped_column(UnicodeText)
 
-    def __init__(self, id, nodename, service, user, binary, version, 
-                 root_dir, port, metrics_port, network,
-                 wallet, peer_id, status, timestamp, records,
-                 uptime, shunned, age, host):
+    def __init__(
+        self,
+        id,
+        nodename,
+        service,
+        user,
+        binary,
+        version,
+        root_dir,
+        port,
+        metrics_port,
+        network,
+        wallet,
+        peer_id,
+        status,
+        timestamp,
+        records,
+        uptime,
+        shunned,
+        age,
+        host,
+    ):
         self.id = id
         self.nodename = nodename
         self.service = service
@@ -177,16 +249,32 @@ class Node(Base):
         self.host = host
 
     def __repr__(self):
-        return f'Node({self.id},"{self.nodename}","{self.service}","{self.user},"{self.binary}"'+\
-            f',"{self.version}","{self.root_dir}",{self.port},{self.metrics_port}' + \
-            f',"{self.network}","{self.wallet}","{self.peer_id}","{self.status}",{self.timestamp}' + \
-            f',{self.records},{self.uptime},{self.shunned},{self.age},"{self.host}")'
-    
+        return (
+            f'Node({self.id},"{self.nodename}","{self.service}","{self.user},"{self.binary}"'
+            + f',"{self.version}","{self.root_dir}",{self.port},{self.metrics_port}'
+            + f',"{self.network}","{self.wallet}","{self.peer_id}","{self.status}",{self.timestamp}'
+            + f',{self.records},{self.uptime},{self.shunned},{self.age},"{self.host}")'
+        )
+
     def __json__(self):
-        return { "id": self.id, "nodename": f"{self.nodename}", "service": f"{self.service}",
-            "user": f"{self.user}", "binary": f"{self.binary}", "version": f"{self.version}",
-            "root_dir": f"{self.root_dir}", "port": self.port, "metrics_port": self.metrics_port,
-            "network": f"{self.network}", "wallet": f"{self.wallet}", "peer_id": f"{self.peer_id}",
-            "status": f"{self.status}", "timestamp": self.timestamp, "records": self.records,
-            "uptime": self.uptime, "shunned": self.shunned, "age": self.age,
-            "host": f"{self.host}" }
+        return {
+            "id": self.id,
+            "nodename": f"{self.nodename}",
+            "service": f"{self.service}",
+            "user": f"{self.user}",
+            "binary": f"{self.binary}",
+            "version": f"{self.version}",
+            "root_dir": f"{self.root_dir}",
+            "port": self.port,
+            "metrics_port": self.metrics_port,
+            "network": f"{self.network}",
+            "wallet": f"{self.wallet}",
+            "peer_id": f"{self.peer_id}",
+            "status": f"{self.status}",
+            "timestamp": self.timestamp,
+            "records": self.records,
+            "uptime": self.uptime,
+            "shunned": self.shunned,
+            "age": self.age,
+            "host": f"{self.host}",
+        }

{wnm-0.0.8.dist-info → wnm-0.0.9.dist-info}/METADATA

@@ -1,9 +1,11 @@
 Metadata-Version: 2.4
 Name: wnm
-Version: 0.0.8
+Version: 0.0.9
 Summary: Manager for Autonomi nodes
 Author-email: Troy Johnson <troy@weave.sh>
 License: GPL-3.0
+Project-URL: Repository, https://github.com/iweave/weave-node-manager.git
+Project-URL: Issues, https://github.com/iweave/weave-node-manager/issues
 Keywords: Autonomi,antnode,weave,xd7
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
@@ -70,7 +72,7 @@ Weave Node Manager (wnm) is a Python application designed to manage nodes for de
    ```
    echo <<EOF
    SHELL=/bin/bash
-   PATH=/home/ubuntu/.local/bin:/home/ubuntu/wnm/,venv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+   PATH=/home/ubuntu/.local/bin:/home/ubuntu/wnm/.venv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
    */1 * * * * ubuntu cd /home/ubuntu/wnm && wnm > /home/ubuntu/wnm/cron.out 2>&1
    EOF
    ```

wnm-0.0.9.dist-info/RECORD

@@ -0,0 +1,9 @@
+wnm/__init__.py,sha256=wnR-RpRGfmQSlcHdue7DLD-ZZ_i7JqSQgh-EpgYdyKk,91
+wnm/__main__.py,sha256=MhRLjRv3VrwVlbtUmhBpfcLgyxe0oERexVIKNVchD3I,44447
+wnm/config.py,sha256=nMJlzxZX7NA0iI_QAuJDE0uI3V_ROjP5v99wdKDfuDs,47
+wnm/models.py,sha256=4FRgDcUxT9Hk4VT1FL2kxhep5G3vkxaU0v9LftylDkA,9997
+wnm-0.0.9.dist-info/METADATA,sha256=hBb-_t8RJsCHg713Owb1I-M6kfybPb_nzLgzwd85Zdc,3119
+wnm-0.0.9.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+wnm-0.0.9.dist-info/entry_points.txt,sha256=jfoemjoLVPeeiBMHKqAExrHQ4Rhf9IXxL4JCnS7ZYFo,42
+wnm-0.0.9.dist-info/top_level.txt,sha256=E6dTE5k6efMEB9LaJAZSBu8zzs__l4R55t0-F-LwufI,4
+wnm-0.0.9.dist-info/RECORD,,

wnm-0.0.8.dist-info/RECORD

@@ -1,9 +0,0 @@
-wnm/__init__.py,sha256=Ha9Nzes9yJ5jMwfAR7DygPzcSKP8jIwQp9GQAVRE8OU,91
-wnm/__main__.py,sha256=779OKyej7fBte3cSUCnqQx3R05iSfjaU2XvOyPYXWI4,42957
-wnm/config.py,sha256=nMJlzxZX7NA0iI_QAuJDE0uI3V_ROjP5v99wdKDfuDs,47
-wnm/models.py,sha256=7lhZkUfFlnDgeEVRngQVuFnzSbJPwbytLMCynAo1j28,9416
-wnm-0.0.8.dist-info/METADATA,sha256=Hvlc06scFyASbDVL-L4NxPyCjNtKWSyyCDAyY8Hn8P0,2972
-wnm-0.0.8.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-wnm-0.0.8.dist-info/entry_points.txt,sha256=jfoemjoLVPeeiBMHKqAExrHQ4Rhf9IXxL4JCnS7ZYFo,42
-wnm-0.0.8.dist-info/top_level.txt,sha256=E6dTE5k6efMEB9LaJAZSBu8zzs__l4R55t0-F-LwufI,4
-wnm-0.0.8.dist-info/RECORD,,