Skip to content

Commit 67c0f3f

Browse files
jph00jph00
authored
Merge pull request #455 from seeM/in-memory-config
in-memory `Config` by passing `save=False`
2 parents 76603b8 + 96f724d commit 67c0f3f

File tree

2 files changed

+59
-62
lines changed

2 files changed

+59
-62
lines changed

‎fastcore/foundation.py‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -249,16 +249,15 @@ def read_config_file(file, **kwargs):
249249
# %% ../nbs/02_foundation.ipynb 131
250250
class Config:
251251
"Reading and writing `ConfigParser` ini files"
252-
def __init__(self, cfg_path, cfg_name, create=None):
252+
def __init__(self, cfg_path, cfg_name, create=None, save=True):
253253
cfg_path = Path(cfg_path).expanduser().absolute()
254254
self.config_path,self.config_file = cfg_path,cfg_path/cfg_name
255-
if not self.config_file.exists():
256-
if create:
257-
self.d = create
255+
if self.config_file.exists(): self.d = read_config_file(self.config_file)
256+
elif create is not None:
257+
self.d = ConfigParser(create)['DEFAULT']
258+
if save:
258259
cfg_path.mkdir(exist_ok=True, parents=True)
259260
self.save()
260-
else: raise FileNotFoundError(f"Could not find {cfg_name}")
261-
self.d = read_config_file(self.config_file)
262261

263262
def __setitem__(self,k,v): self.d[k] = str(v)
264263
def __contains__(self,k): return k in self.d

‎nbs/02_foundation.ipynb‎

Lines changed: 54 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@
266266
"Test whether `o` can be used in a `for` loop"
267267
],
268268
"text/plain": [
269-
"<nbdev.showdoc.BasicMarkdownRenderer at 0x103ad5760>"
269+
"<nbdev.showdoc.BasicMarkdownRenderer>"
270270
]
271271
},
272272
"execution_count": null,
@@ -798,7 +798,7 @@
798798
{
799799
"data": {
800800
"text/plain": [
801-
"['j', 3, 1]"
801+
"[5, 0, 11]"
802802
]
803803
},
804804
"execution_count": null,
@@ -807,6 +807,7 @@
807807
}
808808
],
809809
"source": [
810+
"random.seed(0)\n",
810811
"random.sample(t, 3)"
811812
]
812813
},
@@ -1013,7 +1014,7 @@
10131014
"Retrieve `idx` (can be list of indices, or mask, or int) items"
10141015
],
10151016
"text/plain": [
1016-
"<nbdev.showdoc.BasicMarkdownRenderer at 0x1268a5a90>"
1017+
"<nbdev.showdoc.BasicMarkdownRenderer>"
10171018
]
10181019
},
10191020
"execution_count": null,
@@ -1056,7 +1057,7 @@
10561057
"Set `idx` (can be list of indices, or mask, or int) items to `o` (which is broadcast if not iterable)"
10571058
],
10581059
"text/plain": [
1059-
"<nbdev.showdoc.BasicMarkdownRenderer at 0x1268c9790>"
1060+
"<nbdev.showdoc.BasicMarkdownRenderer>"
10601061
]
10611062
},
10621063
"execution_count": null,
@@ -1097,7 +1098,7 @@
10971098
"Unique items, in stable order"
10981099
],
10991100
"text/plain": [
1100-
"<nbdev.showdoc.BasicMarkdownRenderer at 0x10798ca90>"
1101+
"<nbdev.showdoc.BasicMarkdownRenderer>"
11011102
]
11021103
},
11031104
"execution_count": null,
@@ -1135,7 +1136,7 @@
11351136
"Dict from value to index"
11361137
],
11371138
"text/plain": [
1138-
"<nbdev.showdoc.BasicMarkdownRenderer at 0x1268c9c40>"
1139+
"<nbdev.showdoc.BasicMarkdownRenderer>"
11391140
]
11401141
},
11411142
"execution_count": null,
@@ -1168,13 +1169,13 @@
11681169
"\n",
11691170
"#### L.filter\n",
11701171
"\n",
1171-
"> L.filter (f=<functionnoopat0x103aff820>, negate=False, gen=False,\n",
1172+
"> L.filter (f=<functionnoopat0x11542e1f0>, negate=False, gen=False,\n",
11721173
"> **kwargs)\n",
11731174
"\n",
11741175
"Create new `L` filtered by predicate `f`, passing `args` and `kwargs` to `f`"
11751176
],
11761177
"text/plain": [
1177-
"<nbdev.showdoc.BasicMarkdownRenderer at 0x1268c9fa0>"
1178+
"<nbdev.showdoc.BasicMarkdownRenderer>"
11781179
]
11791180
},
11801181
"execution_count": null,
@@ -1233,7 +1234,7 @@
12331234
"Like `filter`, but return indices for matching items"
12341235
],
12351236
"text/plain": [
1236-
"<nbdev.showdoc.BasicMarkdownRenderer at 0x1268d0c70>"
1237+
"<nbdev.showdoc.BasicMarkdownRenderer>"
12371238
]
12381239
},
12391240
"execution_count": null,
@@ -1271,7 +1272,7 @@
12711272
"Return index of first matching item"
12721273
],
12731274
"text/plain": [
1274-
"<nbdev.showdoc.BasicMarkdownRenderer at 0x1268d0310>"
1275+
"<nbdev.showdoc.BasicMarkdownRenderer>"
12751276
]
12761277
},
12771278
"execution_count": null,
@@ -1309,7 +1310,7 @@
13091310
"Create new `L` with `f` applied to all `items`, passing `args` and `kwargs` to `f`"
13101311
],
13111312
"text/plain": [
1312-
"<nbdev.showdoc.BasicMarkdownRenderer at 0x1268e82e0>"
1313+
"<nbdev.showdoc.BasicMarkdownRenderer>"
13131314
]
13141315
},
13151316
"execution_count": null,
@@ -1391,12 +1392,12 @@
13911392
"\n",
13921393
"#### L.map_dict\n",
13931394
"\n",
1394-
"> L.map_dict (f=<functionnoopat0x103aff820>, *args, gen=False, **kwargs)\n",
1395+
"> L.map_dict (f=<functionnoopat0x11542e1f0>, *args, gen=False, **kwargs)\n",
13951396
"\n",
13961397
"Like `map`, but creates a dict from `items` to function results"
13971398
],
13981399
"text/plain": [
1399-
"<nbdev.showdoc.BasicMarkdownRenderer at 0x1268f4af0>"
1400+
"<nbdev.showdoc.BasicMarkdownRenderer>"
14001401
]
14011402
},
14021403
"execution_count": null,
@@ -1435,7 +1436,7 @@
14351436
"Create new `L` with `zip(*items)`"
14361437
],
14371438
"text/plain": [
1438-
"<nbdev.showdoc.BasicMarkdownRenderer at 0x1268f4520>"
1439+
"<nbdev.showdoc.BasicMarkdownRenderer>"
14391440
]
14401441
},
14411442
"execution_count": null,
@@ -1485,7 +1486,7 @@
14851486
"Combine `zip` and `starmap`"
14861487
],
14871488
"text/plain": [
1488-
"<nbdev.showdoc.BasicMarkdownRenderer at 0x1268f6c70>"
1489+
"<nbdev.showdoc.BasicMarkdownRenderer>"
14891490
]
14901491
},
14911492
"execution_count": null,
@@ -1524,7 +1525,7 @@
15241525
"Create new `L` with `self` zip with each of `*rest`"
15251526
],
15261527
"text/plain": [
1527-
"<nbdev.showdoc.BasicMarkdownRenderer at 0x1268f69a0>"
1528+
"<nbdev.showdoc.BasicMarkdownRenderer>"
15281529
]
15291530
},
15301531
"execution_count": null,
@@ -1564,7 +1565,7 @@
15641565
"Combine `zipwith` and `starmap`"
15651566
],
15661567
"text/plain": [
1567-
"<nbdev.showdoc.BasicMarkdownRenderer at 0x1269028e0>"
1568+
"<nbdev.showdoc.BasicMarkdownRenderer>"
15681569
]
15691570
},
15701571
"execution_count": null,
@@ -1602,7 +1603,7 @@
16021603
"Create new `L` with item `idx` of all `items`"
16031604
],
16041605
"text/plain": [
1605-
"<nbdev.showdoc.BasicMarkdownRenderer at 0x1269025b0>"
1606+
"<nbdev.showdoc.BasicMarkdownRenderer>"
16061607
]
16071608
},
16081609
"execution_count": null,
@@ -1640,7 +1641,7 @@
16401641
"Create new `L` with attr `k` (or value `k` for dicts) of all `items`."
16411642
],
16421643
"text/plain": [
1643-
"<nbdev.showdoc.BasicMarkdownRenderer at 0x1079e73d0>"
1644+
"<nbdev.showdoc.BasicMarkdownRenderer>"
16441645
]
16451646
},
16461647
"execution_count": null,
@@ -1684,7 +1685,7 @@
16841685
"New `L` sorted by `key`. If key is str use `attrgetter`; if int use `itemgetter`"
16851686
],
16861687
"text/plain": [
1687-
"<nbdev.showdoc.BasicMarkdownRenderer at 0x10792bfd0>"
1688+
"<nbdev.showdoc.BasicMarkdownRenderer>"
16881689
]
16891690
},
16901691
"execution_count": null,
@@ -1722,7 +1723,7 @@
17221723
"Class Method: Same as `str.split`, but returns an `L`"
17231724
],
17241725
"text/plain": [
1725-
"<nbdev.showdoc.BasicMarkdownRenderer at 0x107958f70>"
1726+
"<nbdev.showdoc.BasicMarkdownRenderer>"
17261727
]
17271728
},
17281729
"execution_count": null,
@@ -1760,7 +1761,7 @@
17601761
"Class Method: Same as `range`, but returns `L`. Can pass collection for `a`, to use `len(a)`"
17611762
],
17621763
"text/plain": [
1763-
"<nbdev.showdoc.BasicMarkdownRenderer at 0x107958220>"
1764+
"<nbdev.showdoc.BasicMarkdownRenderer>"
17641765
]
17651766
},
17661767
"execution_count": null,
@@ -1799,7 +1800,7 @@
17991800
"Concatenate all elements of list"
18001801
],
18011802
"text/plain": [
1802-
"<nbdev.showdoc.BasicMarkdownRenderer at 0x107958f40>"
1803+
"<nbdev.showdoc.BasicMarkdownRenderer>"
18031804
]
18041805
},
18051806
"execution_count": null,
@@ -1837,7 +1838,7 @@
18371838
"Same as `list.copy`, but returns an `L`"
18381839
],
18391840
"text/plain": [
1840-
"<nbdev.showdoc.BasicMarkdownRenderer at 0x10795f670>"
1841+
"<nbdev.showdoc.BasicMarkdownRenderer>"
18411842
]
18421843
},
18431844
"execution_count": null,
@@ -1871,13 +1872,13 @@
18711872
"\n",
18721873
"#### L.map_first\n",
18731874
"\n",
1874-
"> L.map_first (f=<functionnoopat0x103aff820>,\n",
1875-
"> g=<functionnoopat0x103aff820>, *args, **kwargs)\n",
1875+
"> L.map_first (f=<functionnoopat0x11542e1f0>,\n",
1876+
"> g=<functionnoopat0x11542e1f0>, *args, **kwargs)\n",
18761877
"\n",
18771878
"First element of `map_filter`"
18781879
],
18791880
"text/plain": [
1880-
"<nbdev.showdoc.BasicMarkdownRenderer at 0x10791fe80>"
1881+
"<nbdev.showdoc.BasicMarkdownRenderer>"
18811882
]
18821883
},
18831884
"execution_count": null,
@@ -1916,7 +1917,7 @@
19161917
"Call `setattr` on all items"
19171918
],
19181919
"text/plain": [
1919-
"<nbdev.showdoc.BasicMarkdownRenderer at 0x10793e0a0>"
1920+
"<nbdev.showdoc.BasicMarkdownRenderer>"
19201921
]
19211922
},
19221923
"execution_count": null,
@@ -2003,16 +2004,15 @@
20032004
"#|export\n",
20042005
"class Config:\n",
20052006
" \"Reading and writing `ConfigParser` ini files\"\n",
2006-
" def __init__(self, cfg_path, cfg_name, create=None):\n",
2007+
" def __init__(self, cfg_path, cfg_name, create=None, save=True):\n",
20072008
" cfg_path = Path(cfg_path).expanduser().absolute()\n",
20082009
" self.config_path,self.config_file = cfg_path,cfg_path/cfg_name\n",
2009-
" if not self.config_file.exists():\n",
2010-
" if create:\n",
2011-
" self.d = create\n",
2010+
" if self.config_file.exists(): self.d = read_config_file(self.config_file)\n",
2011+
" elif create is not None:\n",
2012+
" self.d = ConfigParser(create)['DEFAULT']\n",
2013+
" if save:\n",
20122014
" cfg_path.mkdir(exist_ok=True, parents=True)\n",
20132015
" self.save()\n",
2014-
" else: raise FileNotFoundError(f\"Could not find {cfg_name}\")\n",
2015-
" self.d = read_config_file(self.config_file)\n",
20162016
"\n",
20172017
" def __setitem__(self,k,v): self.d[k] = str(v)\n",
20182018
" def __contains__(self,k): return k in self.d\n",
@@ -2030,7 +2030,7 @@
20302030
"cell_type": "markdown",
20312031
"metadata": {},
20322032
"source": [
2033-
"`Config` and provides direct access to the 'DEFAULT' section of a `ConfigParser` ini file."
2033+
"`Config` is a convenient wrapper around `ConfigParser` ini files with a single section (`DEFAULT`)."
20342034
]
20352035
},
20362036
{
@@ -2048,6 +2048,24 @@
20482048
"test_eq(cfg.get('foo','bar'),'bar')"
20492049
]
20502050
},
2051+
{
2052+
"cell_type": "markdown",
2053+
"metadata": {},
2054+
"source": [
2055+
"You can also create an in-memory `Config` by passing `save=False`:"
2056+
]
2057+
},
2058+
{
2059+
"cell_type": "code",
2060+
"execution_count": null,
2061+
"metadata": {},
2062+
"outputs": [],
2063+
"source": [
2064+
"cfg = Config('..', 'tmp.ini', create=_d, save=False)\n",
2065+
"test_eq(cfg.user,'fastai')\n",
2066+
"assert not Path('../tmp.ini').exists()"
2067+
]
2068+
},
20512069
{
20522070
"cell_type": "markdown",
20532071
"metadata": {},
@@ -2059,27 +2077,7 @@
20592077
"cell_type": "code",
20602078
"execution_count": null,
20612079
"metadata": {},
2062-
"outputs": [
2063-
{
2064-
"name": "stdout",
2065-
"output_type": "stream",
2066-
"text": [
2067-
"Converted 00_test.ipynb.\n",
2068-
"Converted 01_basics.ipynb.\n",
2069-
"Converted 02_foundation.ipynb.\n",
2070-
"Converted 03_xtras.ipynb.\n",
2071-
"Converted 03a_parallel.ipynb.\n",
2072-
"Converted 03b_net.ipynb.\n",
2073-
"Converted 04_dispatch.ipynb.\n",
2074-
"Converted 05_transform.ipynb.\n",
2075-
"Converted 06_docments.ipynb.\n",
2076-
"Converted 07_meta.ipynb.\n",
2077-
"Converted 08_script.ipynb.\n",
2078-
"Converted index.ipynb.\n",
2079-
"Converted parallel_win.ipynb.\n"
2080-
]
2081-
}
2082-
],
2080+
"outputs": [],
20832081
"source": [
20842082
"#|hide\n",
20852083
"#|eval: false\n",

0 commit comments

Comments
 (0)