bump imjoy-rpc version (#234)

imjoy-team · Oct 13, 2021 · 66089ff · 66089ff
1 parent 174d59b
commit 66089ff
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 14 deletions.
diff --git a/imjoy/core/plugin.py b/imjoy/core/plugin.py
@@ -35,6 +35,7 @@ def __init__(self, config, interface, codecs, connection, workspace, user_info):
         self.running = False
         self.terminating = False
         self._api_fut = asyncio.Future()
+        self._rpc = None
 
         # Note: we don't need to bind the interface
         # to the plugin as we do in the js version
@@ -269,12 +270,14 @@ def imjoy_rpc_ready(data):
     async def terminate(self):
         """Terminate."""
         try:
-            if self.api and self.api.exit and callable(self.api.exit):
-                logger.info(
-                    "Terminating plugin %s/%s", self.config.workspace, self.name
-                )
-                self.api.exit()
-            self._rpc.disconnect()
+            if self._rpc:
+                if self.api and self.api.exit and callable(self.api.exit):
+                    logger.info(
+                        "Terminating plugin %s/%s", self.config.workspace, self.name
+                    )
+                    self.api.exit()
+
+                self._rpc.disconnect()
         finally:
             logger.info("Plugin %s terminated.", self.config.name)
             self._set_disconnected()
diff --git a/imjoy/startup_apps/echo-service.html b/imjoy/startup_apps/echo-service.html
@@ -6,7 +6,7 @@
    <title>ImJoy Plugin Template</title>
    <meta name="description" content="Template for ImJoy plugin">
    <meta name="author" content="ImJoy-Team">
-   <script src="https://cdn.jsdelivr.net/npm/[email protected].28/dist/imjoy-rpc-socketio.min.js"></script>
+   <script src="https://cdn.jsdelivr.net/npm/[email protected].31/dist/imjoy-rpc-socketio.min.js"></script>
    <scrpt src="https://cdn.jsdelivr.net/npm/[email protected]/src/pluginParser.js"></scrpt>
 </head>
 

diff --git a/imjoy/startup_apps/imjoy-plugin-parser.html b/imjoy/startup_apps/imjoy-plugin-parser.html
@@ -6,7 +6,7 @@
    <title>ImJoy Plugin Template</title>
    <meta name="description" content="Template for ImJoy plugin">
    <meta name="author" content="ImJoy-Team">
-   <script src="https://cdn.jsdelivr.net/npm/[email protected].28/dist/imjoy-rpc-socketio.min.js"></script>
+   <script src="https://cdn.jsdelivr.net/npm/[email protected].31/dist/imjoy-rpc-socketio.min.js"></script>
    <scrpt src="https://cdn.jsdelivr.net/npm/[email protected]/src/pluginParser.js"></scrpt>
 </head>
 

diff --git a/imjoy/templates/web-python-plugin.html b/imjoy/templates/web-python-plugin.html
@@ -32,7 +32,7 @@
 
 async def run():
     try:
-        await micropip.install(["imjoy-rpc>=0.3.30", {% for req in requirements %}"{{req}}", {% endfor %}])
+        await micropip.install(["imjoy-rpc>=0.3.31", {% for req in requirements %}"{{req}}", {% endfor %}])
         # map imjoy_rpc to imjoy
         import imjoy_rpc
         sys.modules

diff --git a/imjoy/templates/web-worker-plugin.html b/imjoy/templates/web-worker-plugin.html
@@ -14,7 +14,7 @@
 
 self.onmessage = function(e) {
 const config = e.data
-importScripts("https://cdn.jsdelivr.net/npm/[email protected].28/dist/imjoy-rpc-socketio.min.js")
+importScripts("https://cdn.jsdelivr.net/npm/[email protected].31/dist/imjoy-rpc-socketio.min.js")
 
 imjoyRPCSocketIO.connectToServer(config).then(async (api)=>{
 await imjoyRPCSocketIO.loadRequirements([{% for req in requirements %}"{{req}}", {% endfor %}])

diff --git a/imjoy/templates/window-plugin.html b/imjoy/templates/window-plugin.html
@@ -6,7 +6,7 @@
   <title>ImJoy Plugin Template</title>
   <meta name="description" content="Template for ImJoy plugin">
   <meta name="author" content="ImJoy-Team">
-  <script src="https://cdn.jsdelivr.net/npm/[email protected].28/dist/imjoy-rpc-socketio.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/[email protected].31/dist/imjoy-rpc-socketio.min.js"></script>
 </head>
 
 <body>

diff --git a/requirements.txt b/requirements.txt
@@ -2,7 +2,7 @@ aiobotocore==1.4.2
 aiofiles==0.7.0
 fastapi==0.70.0
 imjoy-jupyter-extension==0.2.17
-imjoy-rpc==0.3.30
+imjoy-rpc==0.3.31
 ipykernel==6.4.1
 jinja2==3.0.1
 jupyter==1.0.0

diff --git a/setup.py b/setup.py
@@ -14,13 +14,13 @@
     # pylint: disable=unused-import
     import google.colab.output  # noqa: F401
 
-    REQUIREMENTS = ["numpy", "imjoy-rpc>=0.3.30", "imjoy-elfinder"]
+    REQUIREMENTS = ["numpy", "imjoy-rpc>=0.3.31", "imjoy-elfinder"]
 except ImportError:
     REQUIREMENTS = [
         "aiobotocore>=1.4.2",
         "aiofiles",
         "fastapi>=0.70.0",
-        "imjoy-rpc>=0.3.30",
+        "imjoy-rpc>=0.3.31",
         "msgpack>=1.0.2",
         "numpy",
         "pydantic[email]>=1.8.2",