stinger-ipc 0.0.7__py3-none-any.whl → 0.0.9__py3-none-any.whl

{stinger_ipc-0.0.7.dist-info → stinger_ipc-0.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stinger-ipc
-Version: 0.0.7
+Version: 0.0.9
 Summary: Tools to create code to do IPC over MQTT
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown

{stinger_ipc-0.0.7.dist-info → stinger_ipc-0.0.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stinger_ipc-0.0.7.dist-info/licenses/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
+stinger_ipc-0.0.9.dist-info/licenses/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
 stingeripc/__init__.py,sha256=PTr5WfMfB-GL4vp3-XMU8IwGv3Q5RXQ24H7JuEo3hdk,133
 stingeripc/args.py,sha256=x3P8GRu9-jyiMl62t0FPqbWY18FbhMVN4eSa2UzUv6c,3960
 stingeripc/asyncapi.py,sha256=DJZuz_LiQEJjQGlnfRtgOToWVD55uLw5ZoiZ95-bxZc,23291
@@ -22,19 +22,19 @@ stingeripc/templates/cpp/include/structs.hpp.jinja2,sha256=DJAAq07DWJmYAEI9An5yx
 stingeripc/templates/cpp/src/broker.cpp.jinja2,sha256=32bfKFJIzHe8w4JKZKjJ-wv8vVrYtOULyRK8f2lF1ow,9345
 stingeripc/templates/cpp/src/client.cpp.jinja2,sha256=lfIbb-Usnru44-5EmrAGzjFiLqkoiSt-9VYkIrugXSI,9010
 stingeripc/templates/cpp/src/server.cpp.jinja2,sha256=hs27uqLCwYR_1cvhwZwGiXTpEnsoBiGlMJE0pbY5cPg,7765
-stingeripc/templates/html/app.js.jinja2,sha256=UQkCYkGQpbiwd8MN7F3V6q6ruBPjRkJNnf9Glo3s0sE,3990
-stingeripc/templates/html/index.html.jinja2,sha256=xBx0PYWnkRG1ttz53SQACDyMCFN5noUpTR3ECEzkc1I,2050
-stingeripc/templates/html/style.css.jinja2,sha256=C0-ZZk4SIzG9dv9x9MrfhHrtkHBj7jRBFIQ98BFlrcg,3323
+stingeripc/templates/html/app.js.jinja2,sha256=07USEiNgd1euaahPTz3tfcV-aFKEBX83NAVgYVbvr98,4110
+stingeripc/templates/html/index.html.jinja2,sha256=egY_0riMki6czNQLTldOMlRdapFKNMouDfwMIcnDtuo,2155
+stingeripc/templates/html/styles.css.jinja2,sha256=C0-ZZk4SIzG9dv9x9MrfhHrtkHBj7jRBFIQ98BFlrcg,3323
 stingeripc/templates/markdown/index.md.jinja2,sha256=yB1Jpawc1VdBAzmnCI0ikdvVlcjZXf-2xRs159XSnHg,6432
 stingeripc/templates/python/__init__.py.jinja2,sha256=jdZ07ogzJLOgzqqkHjj2_8hld9uBDnvB1DXPXnWkt98,22
 stingeripc/templates/python/client.py.jinja2,sha256=lUlnh-Z2ulDaomx-bR7RAgovmZ4QYLjck0c_885x8DY,16461
-stingeripc/templates/python/connection.py.jinja2,sha256=-ftw5lHa2ab_hfQLhVuFK5HTY5cdetk4YeDjI-KvUe0,7159
+stingeripc/templates/python/connection.py.jinja2,sha256=mTiiC_p4AEwIGH9mvyzYDdu_AKxpI_548LpapL5CM-4,7238
 stingeripc/templates/python/interface_types.py.jinja2,sha256=BcCD0uCzDn1TAn1IvWhHiOsai6MczIBu12Xg0snTHk8,1711
 stingeripc/templates/python/method_codes.py.jinja2,sha256=74i8iKk4Fu9_nE2SYTRrRK2G4mogfJx88ihbmjyfYVQ,1089
 stingeripc/templates/python/pyproject.toml.jinja2,sha256=R-rgSv6RTdgPINvhCwJ180Vzjy9-WkqtLbLgnCov3CI,195
 stingeripc/templates/python/server.py.jinja2,sha256=pxjzLPE7k3DG6zE-zXyK_I16ZF8k-xgbdh_182Fx_E8,11217
 stingeripc/templates/rust/Cargo.toml.jinja2,sha256=teIu5y2AeqSkk0eUPT8CemvzmhRoblCUP5jdmonLfY4,70
-stingeripc/templates/rust/client/Cargo.toml.jinja2,sha256=k_WodPg-gJTnRI4m9P38AfN5tIaztxl3qQY9fwiNWXk,825
+stingeripc/templates/rust/client/Cargo.toml.jinja2,sha256=oymbdtF3apgD4nVxt-fa9__hSZaUFsvjA0AxJarPMGw,858
 stingeripc/templates/rust/client/examples/client.rs.jinja2,sha256=pMLR-xyEJrK4289XUbFEB18HKe3kaRJDoeFBQ89SLU4,2075
 stingeripc/templates/rust/client/src/lib.rs.jinja2,sha256=7GGy_IBH-DBHIZUCvvBq1xbTTVVMczvx5W-i0qO_fvw,15451
 stingeripc/templates/rust/payloads/Cargo.toml.jinja2,sha256=t6WQ5BCBvjagCW8AgK4VYSNjW2OZCX30KQTXk27SGwI,739
@@ -42,16 +42,16 @@ stingeripc/templates/rust/payloads/examples/pub_and_recv.rs.jinja2,sha256=cIbunw
 stingeripc/templates/rust/payloads/src/handler.rs.jinja2,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stingeripc/templates/rust/payloads/src/lib.rs.jinja2,sha256=3vBn2OGm_j7BoyHRHLcH1e0hKRBiqtbgHsz04rTaVMM,86
 stingeripc/templates/rust/payloads/src/payloads.rs.jinja2,sha256=1PUSzmHLMBYsVaCR8gOMdHWK8dmODmLM3WSu9iysN-c,4380
-stingeripc/templates/rust/server/Cargo.toml.jinja2,sha256=Akr0Gxxql5o4QeKabQyz24f20amPoB2LVq7iMa_qCZc,541
-stingeripc/templates/rust/server/examples/server.rs.jinja2,sha256=9no7UyiGEaqDdqN6YiYScYXvYPgoB2IsDrTF_diVVWM,3526
-stingeripc/templates/rust/server/src/lib.rs.jinja2,sha256=dJL5YY776laUmFa4-LltUv6hvxfRkjcWWgj7hGRZ1ps,14831
+stingeripc/templates/rust/server/Cargo.toml.jinja2,sha256=t2MIpoe34RYOtxvpS6ma7W0A9sLlMQBYblpALU805TQ,573
+stingeripc/templates/rust/server/examples/server.rs.jinja2,sha256=NVNR_kamR3t4FSpfYGfao0S9DpK1zXTQcOZR1WDPAaI,3624
+stingeripc/templates/rust/server/src/lib.rs.jinja2,sha256=HhQLsPp3T97zkkW-xzUTJ04Otjm-3M3ZWOOAKfhAi9s,14883
 stingeripc/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stingeripc/tools/cli.py,sha256=oLfVQx4EqRgZ2AH9Xl7X6neXle-aJE55bSXTEvH7RDE,2303
-stingeripc/tools/markdown_generator.py,sha256=hvLbltMLQRG2Gy8l_44GUeDlT5P1eBoSjiEv6HMGrR8,1170
+stingeripc/tools/markdown_generator.py,sha256=HVEWcMjAfVnuWY29kxfAW1mvSxQSF-rdYFA2kWdLOn0,1174
 stingeripc/tools/python_generator.py,sha256=GJwGI6DntkJPJjHN4xSeTD60KgY32gI43IvIByxWSsw,1845
 stingeripc/tools/rust_generator.py,sha256=9E7SMDM-iHE3O26QI3ieAHIInlrLepWMAFRnflKk3KI,2235
-stinger_ipc-0.0.7.dist-info/METADATA,sha256=ogXMAU8avU-vkG2uV7h5PIkRxhroOjFuuwsvYqZY3N4,6037
-stinger_ipc-0.0.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-stinger_ipc-0.0.7.dist-info/entry_points.txt,sha256=bh8k8mvtAog4MKTd82ALSHqQkuD069VrZ-vNlde6XjE,204
-stinger_ipc-0.0.7.dist-info/top_level.txt,sha256=mSNwAf83_1qiTP_vu7XEPBrZu-fDusT1FFyQZzCrRcU,11
-stinger_ipc-0.0.7.dist-info/RECORD,,
+stinger_ipc-0.0.9.dist-info/METADATA,sha256=SLs5s88WQV_YO7rLsEqfbE8ZQ4eaWOTeC6EpQdEavrA,6037
+stinger_ipc-0.0.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+stinger_ipc-0.0.9.dist-info/entry_points.txt,sha256=bh8k8mvtAog4MKTd82ALSHqQkuD069VrZ-vNlde6XjE,204
+stinger_ipc-0.0.9.dist-info/top_level.txt,sha256=mSNwAf83_1qiTP_vu7XEPBrZu-fDusT1FFyQZzCrRcU,11
+stinger_ipc-0.0.9.dist-info/RECORD,,

stingeripc/templates/html/app.js.jinja2

@@ -22,10 +22,18 @@ app.controller("myCtrl", function ($scope, $filter, $location) {
 
     $scope.timePattern = new RegExp("^[0-2][0-9]:[0-5][0-9]$");
     $scope.online = false;
-    $scope.data = {
-        "signals": [{%for _ in stinger.signals.keys()%} null{%if not loop.last%}, {%endif%}{%endfor%}],
-        "properties": [{%for _ in stinger.properties.keys()%} null{%if not loop.last%}, {%endif%}{%endfor%}],
-    }
+    $scope.signals = { {%-for sig_name, signal in stinger.signals.items() %}
+        "{{sig_name | lowerCamelCase}}": {
+            "subscription_id": null,
+            "name": "{{sig_name}}",
+            "received": [],
+            "mqtt_topic": "{{signal.topic}}"
+        }{%if not loop.last%},{%endif%}
+    {%endfor-%} };
+
+    $scope.properties = {
+
+    };
 
     $scope.console = {
         showing: false,

stingeripc/templates/html/index.html.jinja2

@@ -12,27 +12,32 @@
     {%for sig_name, sig in stinger.signals.items() %}
     <div class="signal-box" id="signal-box-{{ sig_name }}">
         <h3 class="signal-title">{{ sig_name }}</h3>
-        <p class="signal-doc">{{ sig.documentation }}</p>
-        <div class="last-signal-value" ng-show="signals[{{loop.index}}]"></div>
+        <div class="signal-doc">{%if sig.documentation %}
+{%markdown%}
+{{ sig.documentation }}
+{%endmarkdown%}
+        {%endif%}</div>
+        <div class="last-signal-value" ng-show="signals['{{sig_name|lowerCamelCase}}']"></div>
     </div>
     {%endfor%}
-
+    {%raw%}
     <div id="console" ng-class="{ 'expanded' : (console.showing) }">
       <div class="top" ng-click=" console.showing = !console.showing ">Request Console <span ng-show="console.showing && console.requests.length > 0" ng-click="console.requests = []"> - Clear</span>
         <p class="expanded-toggle">{{ console.showing ? 'Hide' : 'Show' }}</p>
       </div>
       <div id="request-list">
         <p ng-repeat="msg in console.requests" class="entry">
-          {% raw %}<strong>{{msg.name}}:</strong> <em>{{msg.topic}}</em> <span class="elapsedTime" ng-show="msg.responseTime">{{msg.responseTime - msg.requestTime}}ms</span><span class="elapsedTime" ng-show="msg.eventTime">{{msg.eventTime}}</span>{%endraw%}
+          <strong>{{msg.name}}:</strong> <em>{{msg.topic}}</em> <span class="elapsedTime" ng-show="msg.responseTime">{{msg.responseTime - msg.requestTime}}ms</span><span class="elapsedTime" ng-show="msg.eventTime">{{msg.eventTime}}</span>
           <span class="outgoing" ng-show="msg.payload">{{msg.payload}}</span>
           <span class="incoming" ng-show="msg.response">{{msg.response}}</span>
           <span ng-repeat="result in msg.results" class="action-result">{{result}}</span>
         </p>
       </div>
     </div>
+    {%endraw%}
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.8.2/angular.min.js"></script>
-    <script src="https://unpkg.com/mqtt/dist/mqtt.min.js"></script>
-    <script src="app2.js"></script>
+    <script src="https://unpkg.com/mqtt@5.14.0/dist/mqtt.min.js"></script>
+    <script src="app.js"></script>
   </body>
 </html>

stingeripc/templates/python/connection.py.jinja2

@@ -45,7 +45,7 @@ class {{broker.class_name}}(BrokerConnection):
     class PendingSubscription:
         def __init__(self, topic: str, subscription_id: int):
             self.topic = topic
-            self.subscription_id
+            self.subscription_id = subscription_id
 
     def __init__(self{%if broker.hostname is none%}, host: str, port: int{%endif%}):
         self._logger = logging.getLogger('Connection')
@@ -83,6 +83,7 @@ class {{broker.class_name}}(BrokerConnection):
         self._message_callback = callback
 
     def _on_message(self, client, userdata, msg):
+        self._logger.debug("Got a message to %s", msg.topic)
         if self._message_callback:
             properties = msg.properties.__dict__ if hasattr(msg, 'properties') else {}
             if "UserProperty" in properties:

stingeripc/templates/rust/client/Cargo.toml.jinja2

@@ -14,6 +14,8 @@ num-traits = "0.2.19"
 tokio = { version = "1", features = ["full"] }
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.142"
+log = "0.4"
+env_logger = "0.10"
 
 [dependencies.uuid]
 version = "1.2.1"
@@ -24,4 +26,4 @@ features = [
 ]
 [[example]]
 name = "{{stinger.name | snake_case}}_client_demo"
-path = "examples/client.rs"
+path = "examples/client.rs"

stingeripc/templates/rust/server/Cargo.toml.jinja2

@@ -13,6 +13,8 @@ num-traits = "0.2.19"
 tokio = { version = "1", features = ["full"] }
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.142"
+log = "0.4"
+env_logger = "0.10"
 
 [[example]]
 name = "{{stinger.name | snake_case}}_server_demo"

stingeripc/templates/rust/server/examples/server.rs.jinja2

@@ -33,6 +33,10 @@ fn {{method_name|snake_case}}_handler({%for arg in method.arg_list%}_{{arg.name|
 
 #[tokio::main]
 async fn main() {
+    env_logger::Builder::from_default_env()
+    .target(env_logger::Target::Stdout)
+    .init();
+
     block_on(async {
         {%set broker = stinger.get_example_broker()%}
         let mut connection = MqttierClient::new("localhost", 1883, None).unwrap();

stingeripc/templates/rust/server/src/lib.rs.jinja2

@@ -151,7 +151,7 @@ impl {{stinger.rust.server_struct_name}} {
             {{arg.name}}: {{arg.name|snake_case}},
             {%endfor%}
         };
-        let _ = self.mqttier_client.publish_state("{{sig.topic}}".to_string(), &data, 1).await;
+        let _ = self.mqttier_client.publish_structure("{{sig.topic}}".to_string(), &data).await;
     }
     {%endfor%}
 
@@ -199,6 +199,7 @@ impl {{stinger.rust.server_struct_name}} {
         let new_data = {{prop_name | UpperCamelCase}}Property {
             {{prop.arg_list[0].name}}: data,
         };
+        println!("Publishing to topic {}", topic);
         let _pub_result = publisher.publish_state(topic, &new_data, 1).await;
         {%else%}
         let _pub_result = publisher.publish_state(topic, &data, 1).await;

stingeripc/tools/markdown_generator.py

@@ -17,7 +17,7 @@ def main(inname: Annotated[Path, typer.Argument(exists=True, file_okay=True, dir
     }
     output_dir = Path(outdir).resolve()
     print(f"[bold green]Output directory:[/bold green] {output_dir}")
-    t = jj2.CodeTemplator(output_dir=output_dir)
+    t = jj2.MarkdownTemplator(output_dir=output_dir)
     t.add_template_dir(
         os.path.join(os.path.dirname(__file__), "../templates", "markdown")
     )