jsongrapher 3.7__py3-none-any.whl → 3.8__py3-none-any.whl

JSONGrapher/JSONRecordCreator.py

@@ -8,6 +8,7 @@ import JSONGrapher.styles.trace_styles_collection_library
 global_records_list = [] #This list holds onto records as they are added. Index 0 is the merged record. Each other index corresponds to record number (like 1 is first record, 2 is second record, etc)
 
 
+
 #This is a JSONGrapher specific function
 #That takes filenames and adds new JSONGrapher records to a global_records_list
 #If the all_selected_file_paths and newest_file_name_and_path are [] and [], that means to clear the global_records_list.
@@ -3118,6 +3119,8 @@ def clean_json_fig_dict(json_fig_dict, fields_to_update=None):
 
 ### Beginning of section of file that has functions for "simulate" and "equation" fields, to evaluate equations and call external javascript simulators, as well as support functions ###
 
+local_python_functions_dictionary = {} #This is a global variable that works with the "simulate" feature and lets users call python functions for data generation.
+
 def run_js_simulation(javascript_simulator_url, simulator_input_json_dict, verbose = False):
     """
     Downloads a JavaScript file using its URL, extracts the filename, appends an export statement,
@@ -3227,7 +3230,7 @@ def convert_to_raw_github_url(url):
     return url  # Return unchanged if not a GitHub file URL
 
 #This function takes in a data_series_dict object and then
-#calls an external javascript simulation if needed
+#calls an external python or javascript simulation if needed
 #Then fills the data_series dict with the simulated data.
 #This function is not intended to be called by the regular user
 #because it returns extra fields that need to be parsed out.
@@ -3235,6 +3238,16 @@ def convert_to_raw_github_url(url):
 def simulate_data_series(data_series_dict, simulator_link='', verbose=False):
     if simulator_link == '':
         simulator_link = data_series_dict["simulate"]["model"]  
+    if simulator_link == "local_python": #this is the local python case.
+        #Here, I haev split up the lines of code more than needed so that the logic is easy to follow.
+        simulation_function_label = data_series_dict["simulate"]["simulation_function_label"]
+        simulation_function = local_python_functions_dictionary[simulation_function_label] 
+        simulation_return = simulation_function(data_series_dict) 
+        if "data" in simulation_return: #the simulation return should have the data_series_dict in another dictionary.
+            simulation_result = simulation_return["data"]
+        else: #if there is no "data" field, we will assume that only the data_series_dict has been returned.
+            simulation_result = simulation_return
+        return simulation_result
     try:
         simulation_return = run_js_simulation(simulator_link, data_series_dict, verbose=verbose)
         if isinstance(simulation_return, dict) and "error" in simulation_return: # Check for errors in the returned data

{jsongrapher-3.7.dist-info → jsongrapher-3.8.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: jsongrapher
-Version: 3.7
+Version: 3.8
 Summary: The python version of JSONGrapher with tools for creating JSONGrapher Records.
 Home-page: https://github.com/AdityaSavara/jsongrapher-py
 Author: Aditya Savara
 Author-email: AditySavara2008@u.northwestern.edu
-License: Unlicense
+License: BSD-3-Clause
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

{jsongrapher-3.7.dist-info → jsongrapher-3.8.dist-info}/RECORD

@@ -1,4 +1,4 @@
-JSONGrapher/JSONRecordCreator.py,sha256=bRyQPYr2TJZEtjMUF-idDO6mfRm3Rp_775iangiuRf8,204822
+JSONGrapher/JSONRecordCreator.py,sha256=SFIYYNDpsUAx6vYA-I2ZGxNw7a1yA3yoIEE6oZtZWfc,205808
 JSONGrapher/UnitPytesting.py,sha256=xizJ-2fg9C5oNMFJyfavbBLMusayE9KWQiYIRrQQd4A,4363
 JSONGrapher/UnitpyCustomUnitsTesting.py,sha256=Rwq5p8HXN0FP54lRFgLTV0kgJ9TpcFaD3_C0MEOoEzw,1297
 JSONGrapher/__init__.py,sha256=cc5qXQidP_ABPXdnXy_DTdgPanHuR7ya45LV-BdWVh8,277
@@ -9,10 +9,10 @@ JSONGrapher/units_list.py,sha256=ROrlAsD66oPozZmOaE65xjNUEg3CxkSmA8iPE2_ihYI,344
 JSONGrapher/styles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 JSONGrapher/styles/layout_styles_library.py,sha256=vGb1tE_ETY-Blj2frt8ddHA976ADFSCoabjzKn2ZNYU,3051
 JSONGrapher/styles/trace_styles_collection_library.py,sha256=DUbbO8jTlhn2q-lOY1XYGkHV1RbJX-P5Z1SUCM0qo6M,5952
-jsongrapher-3.7.data/data/LICENSE,sha256=MroL1bQKoAHrMJv2KvABMmZX5j-DZ2EP_zaQacLUtj0,1465
-jsongrapher-3.7.data/data/README.md,sha256=OntfAICB_uwfjoq8tMDYc_W7eXSC2N22X0udPIGb2Nw,5888
-jsongrapher-3.7.dist-info/LICENSE,sha256=MroL1bQKoAHrMJv2KvABMmZX5j-DZ2EP_zaQacLUtj0,1465
-jsongrapher-3.7.dist-info/METADATA,sha256=1gml4jeoRaUaS8IMQfHaftk8Q0hXTLnsUM7dGi_9qfM,6956
-jsongrapher-3.7.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-jsongrapher-3.7.dist-info/top_level.txt,sha256=5f7Ui2hCKCPTQOjD540WKghKNYOvUDNfdpnDbIlAD3Y,12
-jsongrapher-3.7.dist-info/RECORD,,
+jsongrapher-3.8.data/data/LICENSE,sha256=MroL1bQKoAHrMJv2KvABMmZX5j-DZ2EP_zaQacLUtj0,1465
+jsongrapher-3.8.data/data/README.md,sha256=OntfAICB_uwfjoq8tMDYc_W7eXSC2N22X0udPIGb2Nw,5888
+jsongrapher-3.8.dist-info/LICENSE,sha256=MroL1bQKoAHrMJv2KvABMmZX5j-DZ2EP_zaQacLUtj0,1465
+jsongrapher-3.8.dist-info/METADATA,sha256=IZYNGMd9jbDyWIoyqhW1oUan16p04jf228OW4h7wMrk,6959
+jsongrapher-3.8.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+jsongrapher-3.8.dist-info/top_level.txt,sha256=5f7Ui2hCKCPTQOjD540WKghKNYOvUDNfdpnDbIlAD3Y,12
+jsongrapher-3.8.dist-info/RECORD,,