stinger-ipc 0.0.7__tar.gz → 0.0.9__tar.gz

{stinger_ipc-0.0.7/stinger_ipc.egg-info → stinger_ipc-0.0.9}/PKG-INFO

@@ -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 → stinger_ipc-0.0.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "stinger-ipc"
-version = "0.0.7"
+version = "0.0.9"
 description = "Tools to create code to do IPC over MQTT"
 readme = "README.md"
 requires-python = ">=3.12"

{stinger_ipc-0.0.7 → stinger_ipc-0.0.9/stinger_ipc.egg-info}/PKG-INFO

@@ -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 → stinger_ipc-0.0.9}/stinger_ipc.egg-info/SOURCES.txt

@@ -32,7 +32,7 @@ stingeripc/templates/cpp/src/client.cpp.jinja2
 stingeripc/templates/cpp/src/server.cpp.jinja2
 stingeripc/templates/html/app.js.jinja2
 stingeripc/templates/html/index.html.jinja2
-stingeripc/templates/html/style.css.jinja2
+stingeripc/templates/html/styles.css.jinja2
 stingeripc/templates/markdown/index.md.jinja2
 stingeripc/templates/python/__init__.py.jinja2
 stingeripc/templates/python/client.py.jinja2

{stinger_ipc-0.0.7 → stinger_ipc-0.0.9}/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,

{stinger_ipc-0.0.7 → stinger_ipc-0.0.9}/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>

{stinger_ipc-0.0.7 → stinger_ipc-0.0.9}/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:

{stinger_ipc-0.0.7 → stinger_ipc-0.0.9}/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"

{stinger_ipc-0.0.7 → stinger_ipc-0.0.9}/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"

{stinger_ipc-0.0.7 → stinger_ipc-0.0.9}/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();

{stinger_ipc-0.0.7 → stinger_ipc-0.0.9}/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;

{stinger_ipc-0.0.7 → stinger_ipc-0.0.9}/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")
     )