Merge pull request #5 from dimitri-yatsenko/main

clean execution of the master-part chapter

Author: dimitri-yatsenko

book/30-database-design/053-master-part.ipynb

@@ -11,7 +11,7 @@
       "cell_type": "markdown",
       "metadata": {},
       "source": [
-        "Master-part relationships capture the idea that a given entity (*master*) may include several tightly-coupled component entities (*parts*) spread across multiple tables. \n",
+        "Master-part relationships express the idea that a given entity (*master*) may include several tightly-coupled component entities (*parts*) spread across multiple tables. \n",
         "This notion is also described as *compositional integrity*.\n",
         "\n",
         "In DataJoint's relational workflow philosophy, a master part relationship expresses the notion of populated multiple related data artifacts in a single workflow step.\n",
@@ -44,14 +44,6 @@
           "text": [
             "Exception reporting mode: Minimal\n"
           ]
-        },
-        {
-          "ename": "ModuleNotFoundError",
-          "evalue": "No module named 'datajoint'",
-          "output_type": "error",
-          "traceback": [
-            "\u001b[0;31mModuleNotFoundError\u001b[0m\u001b[0;31m:\u001b[0m No module named 'datajoint'\n"
-          ]
         }
       ],
       "source": [
@@ -64,16 +56,16 @@
         "@schema \n",
         "class Polygon(dj.Manual):\n",
         "    definition = \"\"\"\n",
-        "    polygon_id : uint16\n",
+        "    polygon_id : int\n",
         "    \"\"\"\n",
         "\n",
         "    class Vertex(dj.Part):\n",
         "        definition = \"\"\"\n",
         "        -> master\n",
-        "        vertex_id : uint16    \n",
+        "        vertex_id : int \n",
         "        ---\n",
-        "        x : float32\n",
-        "        y : float32\n",
+        "        x : float\n",
+        "        y : float\n",
         "        \"\"\"\n",
         "\n",
         "    # Explicit numeric datatypes such as float32 and uint16 are introduced in DataJoint 2.0.\n",
@@ -86,12 +78,44 @@
       "metadata": {},
       "outputs": [
         {
-          "ename": "NameError",
-          "evalue": "name 'dj' is not defined",
-          "output_type": "error",
-          "traceback": [
-            "\u001b[0;31mNameError\u001b[0m\u001b[0;31m:\u001b[0m name 'dj' is not defined\n"
-          ]
+          "data": {
+            "image/svg+xml": [
+              "<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"98pt\" height=\"98pt\" viewBox=\"0.00 0.00 98.00 98.00\">\n",
+              "<g id=\"graph0\" class=\"graph\" transform=\"scale(1 1) rotate(0) translate(4 94)\">\n",
+              "<polygon fill=\"white\" stroke=\"transparent\" points=\"-4,4 -4,-94 94,-94 94,4 -4,4\"/>\n",
+              "<!-- Polygon -->\n",
+              "<g id=\"node1\" class=\"node\">\n",
+              "<title>Polygon</title>\n",
+              "<g id=\"a_node1\"><a xlink:title=\"polygon_id           &#13;\">\n",
+              "<polygon fill=\"#00ff00\" fill-opacity=\"0.188235\" stroke=\"#00ff00\" stroke-opacity=\"0.188235\" points=\"76.5,-90 13.5,-90 13.5,-55 76.5,-55 76.5,-90\"/>\n",
+              "<text text-anchor=\"start\" x=\"21.5\" y=\"-70.4\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"12.00\" fill=\"darkgreen\">Polygon</text>\n",
+              "</a>\n",
+              "</g>\n",
+              "</g>\n",
+              "<!-- Polygon.Vertex -->\n",
+              "<g id=\"node2\" class=\"node\">\n",
+              "<title>Polygon.Vertex</title>\n",
+              "<g id=\"a_node2\"><a xlink:title=\"→ Polygon&#13;vertex_id            &#13;------------------------------&#13;x                    &#13;y                    &#13;\">\n",
+              "<polygon fill=\"transparent\" stroke=\"transparent\" points=\"90,-19 0,-19 0,0 90,0 90,-19\"/>\n",
+              "<text text-anchor=\"start\" x=\"8\" y=\"-8\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"10.00\">Polygon.Vertex</text>\n",
+              "</a>\n",
+              "</g>\n",
+              "</g>\n",
+              "<!-- Polygon&#45;&gt;Polygon.Vertex -->\n",
+              "<g id=\"edge1\" class=\"edge\">\n",
+              "<title>Polygon-&gt;Polygon.Vertex</title>\n",
+              "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M45,-54.83C45,-43.26 45,-28.32 45,-19.08\"/>\n",
+              "</g>\n",
+              "</g>\n",
+              "</svg>"
+            ],
+            "text/plain": [
+              "<datajoint.diagram.Diagram at 0xffff27979d30>"
+            ]
+          },
+          "execution_count": 3,
+          "metadata": {},
+          "output_type": "execute_result"
         }
       ],
       "source": [
@@ -179,16 +203,11 @@
         "\n",
         "Master-part relationships provide a concise and expressive way to model a master record that owns several subordinate rows. DataJoint’s nested class syntax, simplified foreign key, and transactional populate make this pattern easy to express and safe to use. In the context of relational workflows, masters act as workflow nodes, while parts capture the detailed payload generated in the same workflow step.\n"
       ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {},
-      "source": []
     }
   ],
   "metadata": {
     "kernelspec": {
-      "display_name": "Python 3",
+      "display_name": "base",
       "language": "python",
       "name": "python3"
     },
@@ -202,7 +221,7 @@
       "name": "python",
       "nbconvert_exporter": "python",
       "pygments_lexer": "ipython3",
-      "version": "3.11.11"
+      "version": "3.13.2"
     }
   },
   "nbformat": 4,

book/60-computation/010-computation.ipynb

@@ -13,7 +13,7 @@
     "\n",
     "Some workflow steps are performed by extenal actions---we designate them as *manual* even if these extenal actions are automated by scripts and application. The tables for manual steps are populated using their `insert` methods directly. \n",
     "\n",
-    "Automated steps are treated differently. Their `insert` method are never invoked directly and datajoint will raise an error if one will try to insert \n",
+    "Automated steps are treated differently. Their `insert` method should never be invoked directly and DataJoint clients will raise an error if one will try to insert data directly into a computed table or its parts.\n",
     "\n",
     "\n",
     "\n",