minor fixes

IRL2 · Oct 11, 2024 · 40521d9 · 40521d9
1 parent 248169c
commit 40521d9
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 25 deletions.
diff --git a/examples/basics/UI.py b/examples/basics/UI.py
@@ -53,10 +53,10 @@ def run_simulation(
 
     :return: a string with the simulation type and settings
     """
-    from omni import OmniRunner
-    from playback import PlaybackSimulation
-    from openmm import OpenMMSimulation
-    from record import record_from_server
+    from nanover.omni import OmniRunner
+    from nanover.omni.playback import PlaybackSimulation
+    from nanover.omni.openmm import OpenMMSimulation
+    from nanover.omni.record import record_from_server
 
     global imd_runner
 

diff --git a/examples/basics/nanover_nglview.ipynb b/examples/basics/nanover_nglview.ipynb
@@ -16,12 +16,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
    "metadata": {
-    "ExecuteTime": {
-     "end_time": "2019-06-06T16:04:25.392952Z",
-     "start_time": "2019-06-06T16:04:24.453212Z"
-    },
     "extensions": {
      "jupyter_dashboards": {
       "version": 1,
@@ -34,19 +29,50 @@
        }
       }
      }
+    },
+    "ExecuteTime": {
+     "end_time": "2024-10-11T14:44:17.544149Z",
+     "start_time": "2024-10-11T14:44:16.585864Z"
     }
    },
-   "outputs": [],
-   "source": "from nanover.nglview import NGLClient"
+   "source": "from nanover.nglview import NGLClient",
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [],
+      "application/vnd.jupyter.widget-view+json": {
+       "version_major": 2,
+       "version_minor": 0,
+       "model_id": "3ac00d3435414b7dbaed1cd5c79534fa"
+      }
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    },
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "C:\\Users\\Dhoui\\anaconda3\\envs\\nanover-dev\\Lib\\site-packages\\google\\protobuf\\runtime_version.py:112: UserWarning: Protobuf gencode version 5.27.2 is older than the runtime version 5.28.2 at nanover/protocol/command/command_service.proto. Please avoid checked-in Protobuf gencode that can be obsolete.\n",
+      "  warnings.warn(\n",
+      "C:\\Users\\Dhoui\\anaconda3\\envs\\nanover-dev\\Lib\\site-packages\\google\\protobuf\\runtime_version.py:112: UserWarning: Protobuf gencode version 5.27.2 is older than the runtime version 5.28.2 at nanover/protocol/state/state_service.proto. Please avoid checked-in Protobuf gencode that can be obsolete.\n",
+      "  warnings.warn(\n",
+      "C:\\Users\\Dhoui\\anaconda3\\envs\\nanover-dev\\Lib\\site-packages\\google\\protobuf\\runtime_version.py:112: UserWarning: Protobuf gencode version 5.27.2 is older than the runtime version 5.28.2 at nanover/protocol/trajectory/frame.proto. Please avoid checked-in Protobuf gencode that can be obsolete.\n",
+      "  warnings.warn(\n",
+      "C:\\Users\\Dhoui\\anaconda3\\envs\\nanover-dev\\Lib\\site-packages\\google\\protobuf\\runtime_version.py:112: UserWarning: Protobuf gencode version 5.27.2 is older than the runtime version 5.28.2 at nanover/protocol/array.proto. Please avoid checked-in Protobuf gencode that can be obsolete.\n",
+      "  warnings.warn(\n",
+      "C:\\Users\\Dhoui\\anaconda3\\envs\\nanover-dev\\Lib\\site-packages\\google\\protobuf\\runtime_version.py:112: UserWarning: Protobuf gencode version 5.27.2 is older than the runtime version 5.28.2 at nanover/protocol/trajectory/get_frame.proto. Please avoid checked-in Protobuf gencode that can be obsolete.\n",
+      "  warnings.warn(\n",
+      "C:\\Users\\Dhoui\\anaconda3\\envs\\nanover-dev\\Lib\\site-packages\\google\\protobuf\\runtime_version.py:112: UserWarning: Protobuf gencode version 5.27.2 is older than the runtime version 5.28.2 at nanover/protocol/trajectory/trajectory_service.proto. Please avoid checked-in Protobuf gencode that can be obsolete.\n",
+      "  warnings.warn(\n"
+     ]
+    }
+   ],
+   "execution_count": 1
   },
   {
    "cell_type": "code",
-   "execution_count": null,
    "metadata": {
-    "ExecuteTime": {
-     "end_time": "2019-06-06T16:04:26.572274Z",
-     "start_time": "2019-06-06T16:04:26.482553Z"
-    },
     "extensions": {
      "jupyter_dashboards": {
       "version": 1,
@@ -63,21 +89,21 @@
        }
       }
      }
+    },
+    "ExecuteTime": {
+     "end_time": "2024-10-11T14:44:23.592359Z",
+     "start_time": "2024-10-11T14:44:23.160821Z"
     }
    },
-   "outputs": [],
    "source": [
     "client = NGLClient.autoconnect()"
-   ]
+   ],
+   "outputs": [],
+   "execution_count": 2
   },
   {
    "cell_type": "code",
-   "execution_count": null,
    "metadata": {
-    "ExecuteTime": {
-     "end_time": "2019-06-06T16:04:27.291228Z",
-     "start_time": "2019-06-06T16:04:26.945620Z"
-    },
     "extensions": {
      "jupyter_dashboards": {
       "version": 1,
@@ -94,12 +120,32 @@
        }
       }
      }
+    },
+    "ExecuteTime": {
+     "end_time": "2024-10-11T14:44:25.033806Z",
+     "start_time": "2024-10-11T14:44:25.029535Z"
     }
    },
-   "outputs": [],
    "source": [
     "client.view"
-   ]
+   ],
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "NGLWidget()"
+      ],
+      "application/vnd.jupyter.widget-view+json": {
+       "version_major": 2,
+       "version_minor": 0,
+       "model_id": "498f8c4e763044f3a3d19984651db305"
+      }
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    }
+   ],
+   "execution_count": 3
   },
   {
    "cell_type": "code",