Skip to content

Commit 5695c33

Browse files
Merge remote-tracking branch 'origin/fix_documentation' into fix_documentation
2 parents 95c33dd + f385703 commit 5695c33

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+527
-410
lines changed
File renamed without changes.

docs/signals_notebook/base.html renamed to docs/base.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ <h1 class="title">Module <code>signals_notebook.base</code></h1>
4040
https://github.com/samuelcolvin/pydantic/issues/1577
4141
Adds ability to use properties with setters
4242
&#34;&#34;&#34;
43+
4344
@no_type_check
4445
def __setattr__(self, name, value):
4546
try:
@@ -84,6 +85,7 @@ <h2 class="section-title" id="header-classes">Classes</h2>
8485
https://github.com/samuelcolvin/pydantic/issues/1577
8586
Adds ability to use properties with setters
8687
&#34;&#34;&#34;
88+
8789
@no_type_check
8890
def __setattr__(self, name, value):
8991
try:
File renamed without changes.

docs/signals_notebook/entities/admin_defined_object.html renamed to docs/entities/admin_defined_object.html

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ <h1 class="title">Module <code>signals_notebook.entities.admin_defined_object</c
2929
<pre><code class="python">import json
3030
import logging
3131
from functools import cached_property
32-
from typing import ClassVar, Literal, Optional
32+
from typing import Any, ClassVar, List, Literal, Optional
3333

3434
from pydantic import BaseModel, Field
3535

@@ -163,12 +163,15 @@ <h1 class="title">Module <code>signals_notebook.entities.admin_defined_object</c
163163

164164
return template.render(data=data)
165165

166-
def dump(self, base_path: str, fs_handler: FSHandler) -&gt; None: # type: ignore[override]
166+
def dump(
167+
self, base_path: str, fs_handler: FSHandler, alias: Optional[List[str]] = None
168+
) -&gt; None: # type: ignore[override]
167169
&#34;&#34;&#34;Dump AdminDefinedObject entity
168170

169171
Args:
170172
base_path: content path where create dump
171173
fs_handler: FSHandler
174+
alias: Backup alias
172175

173176
Returns:
174177

@@ -180,12 +183,13 @@ <h1 class="title">Module <code>signals_notebook.entities.admin_defined_object</c
180183
fs_handler.write(
181184
fs_handler.join_path(base_path, self.eid, &#39;metadata.json&#39;),
182185
json.dumps(metadata),
186+
base_alias=alias + [self.name, &#39;__Metadata&#39;] if alias else None,
183187
)
184188
for child in self.get_children():
185189
child.dump(fs_handler.join_path(base_path, self.eid), fs_handler)
186190

187191
@classmethod
188-
def load(cls, path: str, fs_handler: FSHandler, notebook: Notebook) -&gt; None: # type: ignore[override]
192+
def load(cls, path: str, fs_handler: FSHandler, notebook: Notebook) -&gt; None:
189193
&#34;&#34;&#34;Load AdminDefinedObject entity
190194

191195
Args:
@@ -196,11 +200,15 @@ <h1 class="title">Module <code>signals_notebook.entities.admin_defined_object</c
196200
Returns:
197201

198202
&#34;&#34;&#34;
203+
cls._load(path, fs_handler, notebook)
204+
205+
@classmethod
206+
def _load(cls, path: str, fs_handler: FSHandler, parent: Any) -&gt; None:
199207
from signals_notebook.item_mapper import ItemMapper
200208

201209
metadata = json.loads(fs_handler.read(fs_handler.join_path(path, &#39;metadata.json&#39;)))
202210
experiment = cls.create(
203-
notebook=notebook,
211+
notebook=parent,
204212
name=metadata[&#39;name&#39;],
205213
ado_type_name=metadata.get(&#39;ado_name&#39;, CUSTOM_SYSTEM_OBJECT),
206214
description=metadata[&#39;description&#39;],
@@ -209,7 +217,7 @@ <h1 class="title">Module <code>signals_notebook.entities.admin_defined_object</c
209217
child_entities_folders = fs_handler.list_subfolders(path)
210218
for child_entity in child_entities_folders:
211219
child_entity_type = child_entity.split(&#39;:&#39;)[0]
212-
ItemMapper.get_item_class(child_entity_type).load(
220+
ItemMapper.get_item_class(child_entity_type)._load(
213221
fs_handler.join_path(path, child_entity), fs_handler, experiment
214222
)</code></pre>
215223
</details>
@@ -315,12 +323,15 @@ <h2 class="section-title" id="header-classes">Classes</h2>
315323

316324
return template.render(data=data)
317325

318-
def dump(self, base_path: str, fs_handler: FSHandler) -&gt; None: # type: ignore[override]
326+
def dump(
327+
self, base_path: str, fs_handler: FSHandler, alias: Optional[List[str]] = None
328+
) -&gt; None: # type: ignore[override]
319329
&#34;&#34;&#34;Dump AdminDefinedObject entity
320330

321331
Args:
322332
base_path: content path where create dump
323333
fs_handler: FSHandler
334+
alias: Backup alias
324335

325336
Returns:
326337

@@ -332,12 +343,13 @@ <h2 class="section-title" id="header-classes">Classes</h2>
332343
fs_handler.write(
333344
fs_handler.join_path(base_path, self.eid, &#39;metadata.json&#39;),
334345
json.dumps(metadata),
346+
base_alias=alias + [self.name, &#39;__Metadata&#39;] if alias else None,
335347
)
336348
for child in self.get_children():
337349
child.dump(fs_handler.join_path(base_path, self.eid), fs_handler)
338350

339351
@classmethod
340-
def load(cls, path: str, fs_handler: FSHandler, notebook: Notebook) -&gt; None: # type: ignore[override]
352+
def load(cls, path: str, fs_handler: FSHandler, notebook: Notebook) -&gt; None:
341353
&#34;&#34;&#34;Load AdminDefinedObject entity
342354

343355
Args:
@@ -348,11 +360,15 @@ <h2 class="section-title" id="header-classes">Classes</h2>
348360
Returns:
349361

350362
&#34;&#34;&#34;
363+
cls._load(path, fs_handler, notebook)
364+
365+
@classmethod
366+
def _load(cls, path: str, fs_handler: FSHandler, parent: Any) -&gt; None:
351367
from signals_notebook.item_mapper import ItemMapper
352368

353369
metadata = json.loads(fs_handler.read(fs_handler.join_path(path, &#39;metadata.json&#39;)))
354370
experiment = cls.create(
355-
notebook=notebook,
371+
notebook=parent,
356372
name=metadata[&#39;name&#39;],
357373
ado_type_name=metadata.get(&#39;ado_name&#39;, CUSTOM_SYSTEM_OBJECT),
358374
description=metadata[&#39;description&#39;],
@@ -361,7 +377,7 @@ <h2 class="section-title" id="header-classes">Classes</h2>
361377
child_entities_folders = fs_handler.list_subfolders(path)
362378
for child_entity in child_entities_folders:
363379
child_entity_type = child_entity.split(&#39;:&#39;)[0]
364-
ItemMapper.get_item_class(child_entity_type).load(
380+
ItemMapper.get_item_class(child_entity_type)._load(
365381
fs_handler.join_path(path, child_entity), fs_handler, experiment
366382
)</code></pre>
367383
</details>
@@ -490,7 +506,7 @@ <h2 id="args">Args</h2>
490506
<span>Expand source code</span>
491507
</summary>
492508
<pre><code class="python">@classmethod
493-
def load(cls, path: str, fs_handler: FSHandler, notebook: Notebook) -&gt; None: # type: ignore[override]
509+
def load(cls, path: str, fs_handler: FSHandler, notebook: Notebook) -&gt; None:
494510
&#34;&#34;&#34;Load AdminDefinedObject entity
495511

496512
Args:
@@ -501,29 +517,14 @@ <h2 id="args">Args</h2>
501517
Returns:
502518

503519
&#34;&#34;&#34;
504-
from signals_notebook.item_mapper import ItemMapper
505-
506-
metadata = json.loads(fs_handler.read(fs_handler.join_path(path, &#39;metadata.json&#39;)))
507-
experiment = cls.create(
508-
notebook=notebook,
509-
name=metadata[&#39;name&#39;],
510-
ado_type_name=metadata.get(&#39;ado_name&#39;, CUSTOM_SYSTEM_OBJECT),
511-
description=metadata[&#39;description&#39;],
512-
force=True,
513-
)
514-
child_entities_folders = fs_handler.list_subfolders(path)
515-
for child_entity in child_entities_folders:
516-
child_entity_type = child_entity.split(&#39;:&#39;)[0]
517-
ItemMapper.get_item_class(child_entity_type).load(
518-
fs_handler.join_path(path, child_entity), fs_handler, experiment
519-
)</code></pre>
520+
cls._load(path, fs_handler, notebook)</code></pre>
520521
</details>
521522
</dd>
522523
</dl>
523524
<h3>Methods</h3>
524525
<dl>
525526
<dt id="signals_notebook.entities.admin_defined_object.AdminDefinedObject.dump"><code class="name flex">
526-
<span>def <span class="ident">dump</span></span>(<span>self, base_path: str, fs_handler: <a title="signals_notebook.utils.fs_handler.FSHandler" href="../utils/fs_handler.html#signals_notebook.utils.fs_handler.FSHandler">FSHandler</a>) ‑> None</span>
527+
<span>def <span class="ident">dump</span></span>(<span>self, base_path: str, fs_handler: <a title="signals_notebook.utils.fs_handler.FSHandler" href="../utils/fs_handler.html#signals_notebook.utils.fs_handler.FSHandler">FSHandler</a>, alias: Optional[List[str]] = None) ‑> None</span>
527528
</code></dt>
528529
<dd>
529530
<div class="desc"><p>Dump AdminDefinedObject entity</p>
@@ -533,18 +534,23 @@ <h2 id="args">Args</h2>
533534
<dd>content path where create dump</dd>
534535
<dt><strong><code>fs_handler</code></strong></dt>
535536
<dd>FSHandler</dd>
537+
<dt><strong><code>alias</code></strong></dt>
538+
<dd>Backup alias</dd>
536539
</dl>
537540
<p>Returns:</p></div>
538541
<details class="source">
539542
<summary>
540543
<span>Expand source code</span>
541544
</summary>
542-
<pre><code class="python">def dump(self, base_path: str, fs_handler: FSHandler) -&gt; None: # type: ignore[override]
545+
<pre><code class="python">def dump(
546+
self, base_path: str, fs_handler: FSHandler, alias: Optional[List[str]] = None
547+
) -&gt; None: # type: ignore[override]
543548
&#34;&#34;&#34;Dump AdminDefinedObject entity
544549

545550
Args:
546551
base_path: content path where create dump
547552
fs_handler: FSHandler
553+
alias: Backup alias
548554

549555
Returns:
550556

@@ -556,6 +562,7 @@ <h2 id="args">Args</h2>
556562
fs_handler.write(
557563
fs_handler.join_path(base_path, self.eid, &#39;metadata.json&#39;),
558564
json.dumps(metadata),
565+
base_alias=alias + [self.name, &#39;__Metadata&#39;] if alias else None,
559566
)
560567
for child in self.get_children():
561568
child.dump(fs_handler.join_path(base_path, self.eid), fs_handler)</code></pre>

0 commit comments

Comments
 (0)