Merge pull request #5 from jupyter-robotics/dev

Modify socket imports

Author: IsabelParedes

content/introduction.ipynb

@@ -7,6 +7,15 @@
     "# Introduction"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "%pip install ipynao==0.1.1"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -36,7 +45,7 @@
    },
    "outputs": [],
    "source": [
-    "w.connect()"
+    "w.connect(\"nao.local\", port=\"80\")"
    ]
   },
   {
@@ -184,7 +193,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.3"
+   "version": "3.11.4"
   }
  },
  "nbformat": 4,

docs/source/_static/embed-bundle.js.LICENSE.txt

@@ -1 +1,7 @@
+/*!
+ * socket.io-node
+ * Copyright(c) 2011 LearnBoost <dev@learnboost.com>
+ * MIT Licensed
+ */
+
 /*! Socket.IO.js build:0.9.17, development. Copyright(c) 2011 LearnBoost <dev@learnboost.com> MIT Licensed */

examples/introduction.ipynb

@@ -9,11 +9,27 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 1,
    "metadata": {
     "tags": []
    },
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "application/vnd.jupyter.widget-view+json": {
+       "model_id": "cd58f8dba0e641c1b849c4aa111ab0d3",
+       "version_major": 2,
+       "version_minor": 0
+      },
+      "text/plain": [
+       "NaoRobotWidget()"
+      ]
+     },
+     "execution_count": 1,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
    "source": [
     "import ipynao\n",
     "\n",
@@ -30,7 +46,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 2,
    "metadata": {
     "tags": []
    },
@@ -184,7 +200,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.3"
+   "version": "3.11.4"
   }
  },
  "nbformat": 4,

ipynao/_frontend.py

@@ -9,4 +9,4 @@
 """
 
 module_name = "ipynao"
-module_version = "^0.1.0"
+module_version = "^0.1.1"

ipynao/nao_robot.py

@@ -83,10 +83,11 @@ async def go_sleep(self, tSeconds=2):
         return self.wait_for_change("synco")
 
 
-    def connect(self, ip_address="nao.local"):      
+    def connect(self, ip_address="nao.local", port="80"):      
         data = {}
         data["command"] = str("connect")
         data["ipAddress"] = str(ip_address)
+        data["port"] = str(port)
         self.send(data)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ipynao",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "A widget library for controlling Nao",
   "keywords": [
     "jupyter",
@@ -51,7 +51,7 @@
   },
   "dependencies": {
     "@jupyter-widgets/base": "^1.1.10 || ^2 || ^3 || ^4 || ^5 || ^6",
-    "nao-socket.io": "^1.0.2"
+    "nao-socket.io": "1.0.3"
   },
   "devDependencies": {
     "@babel/core": "^7.5.0",

pyproject.toml

@@ -34,7 +34,7 @@ classifiers = [
 dependencies = [
     "ipywidgets>=7.0.0",
 ]
-version = "0.1.0"
+version = "0.1.1"
 
 [project.optional-dependencies]
 docs = [
@@ -104,7 +104,7 @@ file = [
 ]
 
 [tool.tbump.version]
-current = "0.1.0"
+current = "0.1.1"
 regex = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)((?P<channel>a|b|rc|.dev)(?P<release>\\d+))?"
 
 [tool.tbump.git]

requirements.txt

@@ -27,4 +27,4 @@ ipympl>=0.8.2
 ipycanvas>=0.9.1
 
 # Python: ipynao library for Nao robot
-ipynao>=0.1.0
+ipynao>=0.1.1

src/nao-socket.io.d.ts

@@ -0,0 +1 @@
+declare module 'nao-socket.io';

src/qimessaging.ts

@@ -6,21 +6,23 @@
 **   - Laurent LEC    <llec@aldebaran-robotics.com>
 **
 */
-import { io } from "nao-socket.io";
+import io from "nao-socket.io";
 
 export class QiSession {
     connected: Boolean = false;
     disconnected: any;
     host: any;
     service: any;
 
-    constructor(ipAddress: any = "nao.local") {
-        // console.log("DBG Emile qim about to connect w/17"); REMOVE
+    constructor(ipAddress: string = "nao.local", port: string = "80") {
+        console.log("DBG Emile qim about to connect w/17");
+        // @ts-ignore
+        window["oioi"] = io;
         let _socket = io.connect(
-            "nao:nao@" + ipAddress + ":80", 
+            "nao:nao@" + ipAddress + ":" + port,
             { resource: "libs/qimessaging/2/socket.io",
             'force new connection': true });
-        // console.log("DBG Emile qim connecting.."); REMOVE
+        // console.log("DBG Emile qim connecting..");
         let _dfd = new Array();
         let _sigs = new Array();
         let _idm = 0;