Skip to content

Commit

Permalink
vali updartes
Browse files Browse the repository at this point in the history
  • Loading branch information
latentvector committed Dec 24, 2024
1 parent 2975175 commit 7b93998
Show file tree
Hide file tree
Showing 15 changed files with 609 additions and 589 deletions.
2 changes: 1 addition & 1 deletion commune/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
# set the module functions as globalsw
c.add_to_globals(globals())
key = c.get_key # override key function with file key in commune/key.py TODO: remove this line with a better solution

network = c.network
242 changes: 119 additions & 123 deletions commune/cli.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,145 +3,141 @@
import sys
import commune as c
print = c.print

def determine_type(x):
x = str(x)
if isinstance(x, str) :
if x.startswith('py(') and x.endswith(')'):
class cli:
def determine_type(self, x):
x = str(x)
if isinstance(x, str) :
if x.startswith('py(') and x.endswith(')'):
try:
return eval(x[3:-1])
except:
return x
if x.lower() in ['null'] or x == 'None': # convert 'null' or 'None' to None
return None
elif x.lower() in ['true', 'false']: # convert 'true' or 'false' to bool
return bool(x.lower() == 'true')
elif x.startswith('[') and x.endswith(']'): # this is a list
try:
return eval(x[3:-1])
list_items = x[1:-1].split(',')
# try to convert each item to its actual type
x = [self.determine_type(item.strip()) for item in list_items]
if len(x) == 1 and x[0] == '':
x = []
return x
except:
# if conversion fails, return as string
return x
if x.lower() in ['null'] or x == 'None': # convert 'null' or 'None' to None
return None
elif x.lower() in ['true', 'false']: # convert 'true' or 'false' to bool
return bool(x.lower() == 'true')
elif x.startswith('[') and x.endswith(']'): # this is a list
try:
list_items = x[1:-1].split(',')
# try to convert each item to its actual type
x = [determine_type(item.strip()) for item in list_items]
if len(x) == 1 and x[0] == '':
x = []
return x

except:
# if conversion fails, return as string
return x

elif x.startswith('{') and x.endswith('}'):
# this is a dictionary
if len(x) == 2:
return {}
try:
dict_items = x[1:-1].split(',')
# try to convert each item to a key-value pair
return {key.strip(): determine_type(value.strip()) for key, value in [item.split(':', 1) for item in dict_items]}
except:
# if conversion fails, return as string
return x
else:
# try to convert to int or float, otherwise return as string

for type_fn in [int, float]:

elif x.startswith('{') and x.endswith('}'):
# this is a dictionary
if len(x) == 2:
return {}
try:
return type_fn(x)
except ValueError:
pass
return x



def get_args_kwargs(argv):
args = []
kwargs = {}
parsing_kwargs = False
for arg in c.copy(argv):
if '=' in arg:
parsing_kwargs = True
key, value = arg.split('=')
kwargs[key] = determine_type(value)
dict_items = x[1:-1].split(',')
# try to convert each item to a key-value pair
return {key.strip(): self.determine_type(value.strip()) for key, value in [item.split(':', 1) for item in dict_items]}
except:
# if conversion fails, return as string
return x
else:
assert parsing_kwargs is False, 'Cannot mix positional and keyword arguments'
args.append(determine_type(arg))
return args, kwargs
# try to convert to int or float, otherwise return as string

for type_fn in [int, float]:
try:
return type_fn(x)
except ValueError:
pass
return x


def get_init_kwargs(argv, helper_fns = ['code', 'schema', 'fn_schema', 'help', 'fn_info', 'fn_hash']):
init_kwargs = {}
for arg in c.copy(argv):
if arg.startswith('--'): # init kwargs
key = arg[len('--'):].split('=')[0]
if key in helper_fns:
# is it a helper function
return forward([key , argv[0]])
def get_args_kwargs(self, argv):
args = []
kwargs = {}
parsing_kwargs = False
for arg in c.copy(argv):
if '=' in arg:
parsing_kwargs = True
key, value = arg.split('=')
kwargs[key] = self.determine_type(value)
else:
value = arg.split('=')[-1] if '=' in arg else True
argv.remove(arg)
init_kwargs[key] = determine_type(value)
continue
return init_kwargs
assert parsing_kwargs is False, 'Cannot mix positional and keyword arguments'
args.append(self.determine_type(arg))
return args, kwargs

def get_fn(argv, fn_splitters = [':', '/', '//', '::'], init_kwargs={}, default_fn='forward'):

if len(argv) == 0:
fn = default_fn
else:
fn = argv.pop(0).replace('-', '_')
def get_init_kwargs(self, argv, helper_fns = ['code', 'schema', 'fn_schema', 'help', 'fn_info', 'fn_hash']):
init_kwargs = {}
for arg in c.copy(argv):
if arg.startswith('--'): # init kwargs
key = arg[len('--'):].split('=')[0]
if key in helper_fns:
# is it a helper function
return self.forward([key , argv[0]])
else:
value = arg.split('=')[-1] if '=' in arg else True
argv.remove(arg)
init_kwargs[key] = self.determine_type(value)
continue
return init_kwargs


init_kwargs = get_init_kwargs(argv)
def get_fn(self, argv, fn_splitters = [':', '/', '//', '::'], init_kwargs={}, default_fn='forward'):

if len(argv) == 0:
fn = default_fn
else:
fn = argv.pop(0).replace('-', '_')

# get the function object
fn_splitters = [fs for fs in fn_splitters if fs in fn]
if len(fn_splitters) == 1:
fn_splitter = fn_splitters[0]
module, fn = fn.split(fn_splitter)
module = c.shortcuts.get(module, module)
module = c.module(module)
elif len(fn_splitters) == 0:
module = c.module()

if hasattr(module, 'fn2module') and not hasattr(module, fn):
fn2module = module.fn2module() if callable(module.fn2module) else module.fn2module
if not fn in fn2module:
raise Exception(f'Function({fn}) NOT IN Module({module})')
module = c.module(fn2module[fn])
init_kwargs = self.get_init_kwargs(argv)

fn_obj = getattr(module, fn)
initialize_module_class = bool(not hasattr(module, fn) or isinstance(fn, property) or 'self' in c.get_args(fn_obj))
module = module(**init_kwargs) if initialize_module_class else module
print('⚡️'*4+fn+'⚡️'*4, color='yellow')
fn_obj = getattr(module, fn)
return fn_obj
# get the function object
fn_splitters = [fs for fs in fn_splitters if fs in fn]
if len(fn_splitters) == 1:
fn_splitter = fn_splitters[0]
module, fn = fn.split(fn_splitter)
module = c.shortcuts.get(module, module)
module = c.module(module)
elif len(fn_splitters) == 0:
module = c.module()

if hasattr(module, 'fn2module') and not hasattr(module, fn):
fn2module = module.fn2module() if callable(module.fn2module) else module.fn2module
if not fn in fn2module:
raise Exception(f'Function({fn}) NOT IN Module({module})')
module = c.module(fn2module[fn])

def run_fn(fn_obj, args, kwargs):
# call the function
t0 = time.time()
output = fn_obj(*args, **kwargs) if callable(fn_obj) else fn_obj
latency = time.time() - t0
is_error = c.is_error(output)
print(f'❌Error({latency:.3f}sec)❌' if is_error else f'✅Result({latency:.3f}s)✅')
is_generator = c.is_generator(output)
if is_generator:
for item in output:
if isinstance(item, dict):
print(item)
else:
print(item, end='')
else:
print(output)
return output
fn_obj = getattr(module, fn)
initialize_module_class = bool(not hasattr(module, fn) or isinstance(fn, property) or 'self' in c.get_args(fn_obj))
module = module(**init_kwargs) if initialize_module_class else module
print('⚡️'*4+fn+'⚡️'*4, color='yellow')
fn_obj = getattr(module, fn)
return fn_obj

def forward():
argv = sys.argv[1:]
if len(argv) == 0:
argv = ['vs']
fn = get_fn(argv)
args, kwargs = get_args_kwargs(argv)
return run_fn(fn, args, kwargs)
def run_fn(self, fn_obj, args, kwargs):
# call the function
t0 = time.time()
output = fn_obj(*args, **kwargs) if callable(fn_obj) else fn_obj
latency = time.time() - t0
is_error = c.is_error(output)
print(f'❌Error({latency:.3f}sec)❌' if is_error else f'✅Result({latency:.3f}s)✅')
is_generator = c.is_generator(output)
if is_generator:
for item in output:
if isinstance(item, dict):
print(item)
else:
print(item, end='')
else:
print(output)
return output

def forward(self):
argv = sys.argv[1:]
if len(argv) == 0:
argv = ['vs']
fn = self.get_fn(argv)
args, kwargs = self.get_args_kwargs(argv)
return self.run_fn(fn, args, kwargs)

def main():
forward()
cli().forward()

Loading

0 comments on commit 7b93998

Please sign in to comment.