fastcore 2.2.7__tar.gz → 2.2.9__tar.gz

{fastcore-2.2.7/fastcore.egg-info → fastcore-2.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastcore
-Version: 2.2.7
+Version: 2.2.9
 Summary: Python supercharged for fastai development
 Author-email: Jeremy Howard and Sylvain Gugger <infos@fast.ai>
 License: Apache-2.0

{fastcore-2.2.7 → fastcore-2.2.9}/fastcore/__init__.py

@@ -55,4 +55,4 @@ Modules:
 - `fastcore.xml`: Concise generation of XML.
 - `fastcore.xtras`: Utility functions used in the fastai library"""
 
-__version__ = "2.2.7"
+__version__ = "2.2.9"

{fastcore-2.2.7 → fastcore-2.2.9}/fastcore/_modidx.py

@@ -207,6 +207,7 @@ d = { 'settings': { 'branch': 'main',
                                  'fastcore.basics.groupby': ('basics.html#groupby', 'fastcore/basics.py'),
                                  'fastcore.basics.hasattrs': ('basics.html#hasattrs', 'fastcore/basics.py'),
                                  'fastcore.basics.humanize': ('basics.html#humanize', 'fastcore/basics.py'),
+                                 'fastcore.basics.id_words': ('basics.html#id_words', 'fastcore/basics.py'),
                                  'fastcore.basics.ifnone': ('basics.html#ifnone', 'fastcore/basics.py'),
                                  'fastcore.basics.ignore_exceptions': ('basics.html#ignore_exceptions', 'fastcore/basics.py'),
                                  'fastcore.basics.ignore_exceptions.__enter__': ( 'basics.html#ignore_exceptions.__enter__',
@@ -272,10 +273,14 @@ d = { 'settings': { 'branch': 'main',
                                  'fastcore.basics.str_enum': ('basics.html#str_enum', 'fastcore/basics.py'),
                                  'fastcore.basics.strcat': ('basics.html#strcat', 'fastcore/basics.py'),
                                  'fastcore.basics.to_bool': ('basics.html#to_bool', 'fastcore/basics.py'),
+                                 'fastcore.basics.to_camel': ('basics.html#to_camel', 'fastcore/basics.py'),
                                  'fastcore.basics.to_date': ('basics.html#to_date', 'fastcore/basics.py'),
                                  'fastcore.basics.to_float': ('basics.html#to_float', 'fastcore/basics.py'),
                                  'fastcore.basics.to_int': ('basics.html#to_int', 'fastcore/basics.py'),
+                                 'fastcore.basics.to_kebab': ('basics.html#to_kebab', 'fastcore/basics.py'),
                                  'fastcore.basics.to_list': ('basics.html#to_list', 'fastcore/basics.py'),
+                                 'fastcore.basics.to_pascal': ('basics.html#to_pascal', 'fastcore/basics.py'),
+                                 'fastcore.basics.to_snake': ('basics.html#to_snake', 'fastcore/basics.py'),
                                  'fastcore.basics.tonull': ('basics.html#tonull', 'fastcore/basics.py'),
                                  'fastcore.basics.true': ('basics.html#true', 'fastcore/basics.py'),
                                  'fastcore.basics.try_attrs': ('basics.html#try_attrs', 'fastcore/basics.py'),
@@ -891,6 +896,9 @@ d = { 'settings': { 'branch': 'main',
                                 'fastcore.xtras.SaveReturn': ('xtras.html#savereturn', 'fastcore/xtras.py'),
                                 'fastcore.xtras.SaveReturn.__init__': ('xtras.html#savereturn.__init__', 'fastcore/xtras.py'),
                                 'fastcore.xtras.SaveReturn.__iter__': ('xtras.html#savereturn.__iter__', 'fastcore/xtras.py'),
+                                'fastcore.xtras.TruncatedString': ('xtras.html#truncatedstring', 'fastcore/xtras.py'),
+                                'fastcore.xtras.TruncatedString.__new__': ('xtras.html#truncatedstring.__new__', 'fastcore/xtras.py'),
+                                'fastcore.xtras.TruncatedString.__repr__': ('xtras.html#truncatedstring.__repr__', 'fastcore/xtras.py'),
                                 'fastcore.xtras.Unset': ('xtras.html#unset', 'fastcore/xtras.py'),
                                 'fastcore.xtras.Unset.__bool__': ('xtras.html#unset.__bool__', 'fastcore/xtras.py'),
                                 'fastcore.xtras.Unset.__repr__': ('xtras.html#unset.__repr__', 'fastcore/xtras.py'),
@@ -982,6 +990,7 @@ d = { 'settings': { 'branch': 'main',
                                 'fastcore.xtras.timed_cache': ('xtras.html#timed_cache', 'fastcore/xtras.py'),
                                 'fastcore.xtras.trace': ('xtras.html#trace', 'fastcore/xtras.py'),
                                 'fastcore.xtras.trim_wraps': ('xtras.html#trim_wraps', 'fastcore/xtras.py'),
+                                'fastcore.xtras.trunc_ctr': ('xtras.html#trunc_ctr', 'fastcore/xtras.py'),
                                 'fastcore.xtras.truncstr': ('xtras.html#truncstr', 'fastcore/xtras.py'),
                                 'fastcore.xtras.type2str': ('xtras.html#type2str', 'fastcore/xtras.py'),
                                 'fastcore.xtras.unqid': ('xtras.html#unqid', 'fastcore/xtras.py'),

{fastcore-2.2.7 → fastcore-2.2.9}/fastcore/basics.py

@@ -44,20 +44,20 @@ __all__ = ['defaults', 'null', 'num_methods', 'rnum_methods', 'inum_methods', 'a
            'risinstance', 'ver2tuple', 'Inf', 'in_', 'ret_true', 'ret_false', 'stop', 'gen', 'chunked', 'otherwise',
            'custom_dir', 'adict', 'AttrDict', 'AttrDictDefault', 'NS', 'get_annotations_ex', 'eval_type', 'type_hints',
            'annotations', 'anno_ret', 'signature_ex', 'union2tuple', 'argnames', 'with_cast', 'store_attr', 'attrdict',
-           'properties', 'camel2words', 'camel2snake', 'snake2camel', 'humanize', 'class2attr', 'getcallable',
-           'getattrs', 'hasattrs', 'setattrs', 'try_attrs', 'DepProp', 'GetAttrBase', 'GetAttr', 'delegate_attr',
-           'ShowPrint', 'Int', 'Str', 'Float', 'partition', 'partition_dict', 'flatten', 'concat', 'strcat',
-           'detuplify', 'replicate', 'setify', 'merge', 'range_of', 'groupby', 'last_index', 'filter_dict',
-           'filter_keys', 'filter_values', 'cycle', 'zip_cycle', 'sorted_ex', 'not_', 'argwhere', 'filter_ex',
-           'renumerate', 'first', 'last', 'only', 'nested_attr', 'nested_setdefault', 'nested_callable', 'nested_idx',
-           'set_nested_idx', 'val2idx', 'uniqueify', 'loop_first_last', 'loop_first', 'loop_last', 'first_match',
-           'last_match', 'joins', 'fastuple', 'bind', 'mapt', 'map_ex', 'compose', 'maps', 'partialler', 'instantiate',
-           'using_attr', 'negate', 'fail_clean', 'dstar', 'copy_func', 'patch_to', 'patch', 'extend_enum', 'compile_re',
-           'ImportEnum', 'StrEnum', 'str_enum', 'ValEnum', 'Stateful', 'NotStr', 'PrettyString', 'even_mults',
-           'num_cpus', 'add_props', 'str2bool', 'str2int', 'str2float', 'str2list', 'str2date', 'str2dt', 'to_bool',
-           'to_int', 'to_float', 'to_list', 'to_date', 'typed', 'exec_new', 'exec_import', 'kindsort',
-           'sig_with_params', 'fdelegates', 'xdumps', 'revive_dates', 'lt', 'gt', 'le', 'ge', 'eq', 'ne', 'add', 'sub',
-           'mul', 'truediv', 'is_', 'is_not', 'mod']
+           'properties', 'id_words', 'to_camel', 'to_pascal', 'to_kebab', 'to_snake', 'camel2words', 'camel2snake',
+           'snake2camel', 'humanize', 'class2attr', 'getcallable', 'getattrs', 'hasattrs', 'setattrs', 'try_attrs',
+           'DepProp', 'GetAttrBase', 'GetAttr', 'delegate_attr', 'ShowPrint', 'Int', 'Str', 'Float', 'partition',
+           'partition_dict', 'flatten', 'concat', 'strcat', 'detuplify', 'replicate', 'setify', 'merge', 'range_of',
+           'groupby', 'last_index', 'filter_dict', 'filter_keys', 'filter_values', 'cycle', 'zip_cycle', 'sorted_ex',
+           'not_', 'argwhere', 'filter_ex', 'renumerate', 'first', 'last', 'only', 'nested_attr', 'nested_setdefault',
+           'nested_callable', 'nested_idx', 'set_nested_idx', 'val2idx', 'uniqueify', 'loop_first_last', 'loop_first',
+           'loop_last', 'first_match', 'last_match', 'joins', 'fastuple', 'bind', 'mapt', 'map_ex', 'compose', 'maps',
+           'partialler', 'instantiate', 'using_attr', 'negate', 'fail_clean', 'dstar', 'copy_func', 'patch_to', 'patch',
+           'extend_enum', 'compile_re', 'ImportEnum', 'StrEnum', 'str_enum', 'ValEnum', 'Stateful', 'NotStr',
+           'PrettyString', 'even_mults', 'num_cpus', 'add_props', 'str2bool', 'str2int', 'str2float', 'str2list',
+           'str2date', 'str2dt', 'to_bool', 'to_int', 'to_float', 'to_list', 'to_date', 'typed', 'exec_new',
+           'exec_import', 'kindsort', 'sig_with_params', 'fdelegates', 'xdumps', 'revive_dates', 'lt', 'gt', 'le', 'ge',
+           'eq', 'ne', 'add', 'sub', 'mul', 'truediv', 'is_', 'is_not', 'mod']
 
 # %% ../nbs/01_basics.ipynb #0e91ed82
 from .imports import *
@@ -516,26 +516,46 @@ def properties(cls, *ps):
     "Change attrs in `cls` with names in `ps` to properties"
     for p in ps: setattr(cls,p,property(getattr(cls,p)))
 
-# %% ../nbs/01_basics.ipynb #d02e464d
-_c2w_re = re.compile(r'((?<=[a-z])[A-Z]|(?<!\A)[A-Z](?=[a-z]))')
-_camel_re1 = re.compile('(.)([A-Z][a-z]+)')
-_camel_re2 = re.compile('([a-z0-9])([A-Z])')
+# %% ../nbs/01_basics.ipynb #ff5313ae
+def id_words(s:str, splits:str='-_ :c')->list:
+    "Split identifier `s` into words: punctuation chars in `splits` are separators (runs kept as empty words, so they survive a round trip), 'c' splits case boundaries"
+    seps = ''.join(c for c in splits if not c.isalnum())
+    parts = re.split(f'[{re.escape(seps)}]', s) if seps else [s]
+    if 'c' in splits: parts = [w for p in parts for w in re.split(r'(?<=[a-z0-9])(?=[A-Z])|(?<=[A-Z])(?=[A-Z][a-z])', p)]
+    return parts
+
+# %% ../nbs/01_basics.ipynb #8918dc5c
+def to_camel(s:str, splits:str='-_ :c')->str:
+    "camelCase form of `s`; acronym words after the first keep their casing"
+    ws = id_words(s, splits)
+    return ws[0].lower() + ''.join(w if w.isupper() else w.title() for w in ws[1:]) if ws else s
+
+def to_pascal(s:str, splits:str='-_ :c')->str:
+    "PascalCase form of `s`; every word Title-cased (acronyms flatten)"
+    return ''.join(w.title() for w in id_words(s, splits))
+
+def to_kebab(s:str, splits:str='-_ :c')->str:
+    "kebab-case form of `s`"
+    return '-'.join(w.lower() for w in id_words(s, splits))
+
+def to_snake(s:str, splits:str='-_ :c')->str:
+    "snake_case form of `s`"
+    return '_'.join(w.lower() for w in id_words(s, splits))
 
 # %% ../nbs/01_basics.ipynb #dd737e81
 def camel2words(s, space=' '):
     "Convert CamelCase to 'spaced words'"
-    return _c2w_re.sub(rf'{space}\1', s)
+    return space.join(id_words(s, 'c'))
 
 # %% ../nbs/01_basics.ipynb #a588a317
 def camel2snake(name):
     "Convert CamelCase to snake_case"
-    s1   = _camel_re1.sub(r'\1_\2', name)
-    return _camel_re2.sub(r'\1_\2', s1).lower()
+    return to_snake(name, 'c')
 
 # %% ../nbs/01_basics.ipynb #bbd632b4
 def snake2camel(s):
     "Convert snake_case to CamelCase"
-    return ''.join(s.title().split('_'))
+    return to_pascal(s, '_')
 
 # %% ../nbs/01_basics.ipynb #9f4a540a
 def humanize(x):

{fastcore-2.2.7 → fastcore-2.2.9}/fastcore/xtras.py

@@ -29,11 +29,11 @@ __all__ = ['UNSET', 'spark_chars', 'walk_join', 'walk', 'exttypes', 'globtastic'
            'ReindexCollection', 'SaveReturn', 'trim_wraps', 'save_iter', 'asave_iter', 'strloader', 'frontmatter',
            'clean_cli_output', 'unqid', 'rtoken_hex', 'friendly_name', 'n_friendly_names', 'exec_eval',
            'get_source_link', 'sparkline', 'modify_exception', 'round_multiple', 'set_num_threads', 'join_path_file',
-           'autostart', 'EventTimer', 'stringfmt_names', 'PartialFormatter', 'partial_format', 'truncstr', 'fenced',
-           'fenced_blocks', 'str_diff', 'utc2local', 'local2utc', 'trace', 'modified_env', 'ContextManagers',
-           'shufflish', 'console_help', 'hl_md', 'type2str', 'dataclass_src', 'nullable_dc', 'make_nullable',
-           'flexiclass', 'asdict', 'vars_pub', 'is_typeddict', 'is_namedtuple', 'CachedIter', 'flexicache',
-           'time_policy', 'mtime_policy', 'timed_cache']
+           'autostart', 'EventTimer', 'stringfmt_names', 'PartialFormatter', 'partial_format', 'truncstr', 'trunc_ctr',
+           'TruncatedString', 'fenced', 'fenced_blocks', 'str_diff', 'utc2local', 'local2utc', 'trace', 'modified_env',
+           'ContextManagers', 'shufflish', 'console_help', 'hl_md', 'type2str', 'dataclass_src', 'nullable_dc',
+           'make_nullable', 'flexiclass', 'asdict', 'vars_pub', 'is_typeddict', 'is_namedtuple', 'CachedIter',
+           'flexicache', 'time_policy', 'mtime_policy', 'timed_cache']
 
 # %% ../nbs/03_xtras.ipynb #3401d507
 from .imports import *
@@ -983,6 +983,22 @@ def truncstr(s:str, maxlen:int, suf:str='…', space='', sizevar:str=None)->str:
     if sizevar: suf = suf.format_map({sizevar: len(s)})
     return s[:maxlen-len(suf)]+suf if len(s)+len(space)>maxlen else s+space
 
+# %% ../nbs/03_xtras.ipynb #a67b3fca
+def trunc_ctr(s:str, mx:int=1000)->str:
+    "Truncate the middle of `s` so ~`mx` chars remain, marking the elision with its `humanize`d size"
+    if mx is None or len(s)<=mx: return s
+    h = mx//2
+    return f'{s[:h]}…[{humanize(len(s)-mx)} chars]…{s[len(s)-(mx-h):]}'
+
+# %% ../nbs/03_xtras.ipynb #8d120ca6
+class TruncatedString(str):
+    "A `str` whose repr shows contents verbatim, middle-truncated to ~`mx` chars"
+    def __new__(cls, s='', mx:int=1000):
+        res = super().__new__(cls, s)
+        res.mx = mx
+        return res
+    def __repr__(self): return trunc_ctr(self, self.mx)
+
 # %% ../nbs/03_xtras.ipynb #2f5e6b12
 def fenced(text:str, info:str='', ch:str='`')->str:
     "Wrap `text` in a fence of `ch`, one char longer than any run of `ch` inside it (min 3)"

{fastcore-2.2.7 → fastcore-2.2.9/fastcore.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastcore
-Version: 2.2.7
+Version: 2.2.9
 Summary: Python supercharged for fastai development
 Author-email: Jeremy Howard and Sylvain Gugger <infos@fast.ai>
 License: Apache-2.0