ararpy 0.1.33__tar.gz → 0.1.35__tar.gz

{ararpy-0.1.33 → ararpy-0.1.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ararpy
-Version: 0.1.33
+Version: 0.1.35
 Summary: A project for Ar-Ar geochronology
 Home-page: https://github.com/wuyangchn/ararpy.git
 Author: Yang Wu

{ararpy-0.1.33 → ararpy-0.1.35}/ararpy/__init__.py

@@ -16,10 +16,10 @@ from . import calc, smp, files, thermo, test
 """ Information """
 
 name = 'ararpy'
-version = '0.1.33'
+version = '0.1.35'
 __version__ = version
 full_version = version
-last_update = '2025-10-01'
+last_update = '2025-12-02'
 
 """ ArArPy Functions """
 

{ararpy-0.1.33 → ararpy-0.1.35}/ararpy/calc/basic.py

@@ -10,8 +10,7 @@
 #
 """
 import copy
-import random
-import string
+import secrets
 import numpy as np
 from scipy import stats
 from datetime import datetime, timezone, timedelta
@@ -100,8 +99,8 @@ def update_dicts(a: dict, b: dict):
     return res
 
 
-def get_random_digits(length: int = 7) -> str:
-    return ''.join(random.choices(string.digits, k=length))
+def get_random_string(length: int = 8) -> str:
+    return secrets.token_hex(max(int(length/2), 1))
 
 
 def monte_carlo(func, inputs, confidence_level, **kwargs):

{ararpy-0.1.33 → ararpy-0.1.35}/ararpy/calc/plot.py

@@ -53,9 +53,8 @@ def get_axis_scale(data: list, count=6, increment=None, extra_count=0, min_inter
             str(decimal.Decimal(int(interval / mag // min_interval) + min_interval) * decimal.Decimal(str(mag))))
     else:
         increment = decimal.Decimal(increment)
-    start = decimal.Decimal(0)
+    start = decimal.Decimal(_min) // increment * increment
     if _min < 0:
-        start = -increment
         while start > _min:
             start -= increment
     else:

{ararpy-0.1.33 → ararpy-0.1.35}/ararpy/calc/regression.py

@@ -928,7 +928,7 @@ def exponential(a0: list, a1: list):
     except IndexError:
         raise IndexError
 
-    f = linest(a0, [b ** _x for _x in a1])
+    f = linest(a0, [b ** xi for xi in a1])
     a, sea, c, sec = f[5][1], f[6][1], f[0], f[1]
 
     calculated_y = [_exp_func(i, a, b, c) for i in a1]
@@ -942,7 +942,7 @@ def exponential(a0: list, a1: list):
     m_ssresid = ssresid / df
     r2 = ssreg / sstotal if sstotal != 0 else 1
 
-    z = [b ** i for i in a1]
+    z = [b ** xi for xi in a1]
     intercept = a + c
     se_intercept_1 = np.sqrt(sea ** 2 + sec ** 2)
     # calculate error of intercept

{ararpy-0.1.33 → ararpy-0.1.35}/ararpy/files/basic.py

@@ -12,31 +12,9 @@
 
 import os
 import pickle
-import traceback
 import json
 
 
-def upload(file, media_dir):
-    try:
-        name, suffix = os.path.splitext(file.name)
-        if suffix.lower() not in [
-            '.xls', '.age', '.xlsx', '.arr', '.jpg', '.png', '.txt',
-            '.log', '.seq', '.json', '.ahd', '.csv', '.ngxdp']:
-            raise TypeError(f"The imported file is not supported: {suffix}")
-        web_file_path = os.path.join(media_dir, file.name)
-        with open(web_file_path, 'wb') as f:
-            for chunk in file.chunks():
-                f.write(chunk)
-        print("File path on the server: %s" % web_file_path)
-    except PermissionError:
-        raise ValueError(f'Permission denied')
-    except (Exception, BaseException) as e:
-        print(traceback.format_exc())
-        raise ValueError(f'Error in opening file: {e}')
-    else:
-        return web_file_path, name, suffix
-
-
 def read(file_path):
     """ Read text files, default 'r', 'rb'
     Parameters

{ararpy-0.1.33 → ararpy-0.1.35}/ararpy/files/calc_file.py

@@ -291,8 +291,8 @@ def open_240(data: pd.DataFrame, logs01: pd.DataFrame, logs02: pd.DataFrame):
         -999, -999, -999, -999, -999, -999, -999, -999,
         # 123-130
         -999, -999, -999, -999, -999, -999, -999, -999,
-        # 131-135
-        -999, -999, -999, -999, -999,
+        # 131-137
+        -999, -999, -999, -999, -999, -999, -999,
     ]
 
     # double transpose to remove keys
@@ -591,9 +591,9 @@ class ArArCalcFile:
         book_contents = read_calc_file(self.file_path)
         # create data frames for book values
         content = pd.DataFrame(book_contents['Data Tables'])
-        logs01 = pd.DataFrame(book_contents['Logs01'])
-        logs02 = pd.DataFrame(book_contents['Logs02'])
-        logs03 = pd.DataFrame(book_contents['Logs03'])
+        logs01 = pd.DataFrame(book_contents.get('Logs01', [[]]))
+        logs02 = pd.DataFrame(book_contents.get('Logs02', [[]]))
+        logs03 = pd.DataFrame(book_contents.get('Logs03', [[]]))
 
         start_row = 5
         sequence_num = int(logs03[2][0])
@@ -613,7 +613,7 @@ class ArArCalcFile:
             material = data[46][0]
             analyst = data[48][0]
         else:
-            raise ValueError(f'non-supported version: {version}')
+            raise ValueError(f'Unsupported version: {version}')
 
         # change error type, 2sigma to 1sigma..., relative errors to absolute errors
         data = change_error_type(data, header)

{ararpy-0.1.33 → ararpy-0.1.35}/ararpy/files/raw_file.py

@@ -65,7 +65,7 @@ DEFAULT_SAMPLE_INFO = {
 
 
 
-def open_file(file_path: str, input_filter: List[Union[str, int, bool]]):
+def open_file(file_path: str, input_filter: List[Union[str, int, bool]], name=None):
     """
     Parameters
     ----------
@@ -99,10 +99,10 @@ def open_file(file_path: str, input_filter: List[Union[str, int, bool]]):
             ['txt', 'excel', 'Qtegra Exported XLS', 'Seq'][int(input_filter[1])]]
     except KeyError:
         raise FileNotFoundError("Wrong File.")
-    return handler(file_path, input_filter)
+    return handler(file_path, input_filter, name)
 
 
-def open_qtegra_exported_xls(filepath, input_filter=None):
+def open_qtegra_exported_xls(filepath, input_filter=None, name=None):
     if input_filter is None:
         input_filter = []
     try:
@@ -150,7 +150,7 @@ def open_qtegra_exported_xls(filepath, input_filter=None):
         return {'data': step_list}
 
 
-def open_raw_txt(file_path, input_filter: List[Union[str, int]]):
+def open_raw_txt(file_path, input_filter: List[Union[str, int]], name=None):
     """
     Parameters
     ----------
@@ -173,12 +173,12 @@ def open_raw_txt(file_path, input_filter: List[Union[str, int]]):
         lines = [line.strip().split(['\t', ';', " ", ",", input_filter[3]][int(input_filter[2])])
                  for line in contents.decode(encoding=encoding["encoding"]).split('\r\n')]
 
-    file_name = os.path.basename(file_path).rstrip(os.path.splitext(file_path)[-1])
+    file_name = os.path.basename(file_path).rstrip(os.path.splitext(file_path)[-1]) if name is None else name
     step_list = get_raw_data([lines], input_filter, file_name=file_name)
     return {'data': step_list}
 
 
-def open_raw_xls(file_path, input_filter: List[Union[str, int]]):
+def open_raw_xls(file_path, input_filter: List[Union[str, int]], name):
     """
     Parameters
     ----------
@@ -205,13 +205,13 @@ def open_raw_xls(file_path, input_filter: List[Union[str, int]]):
 
     wb = open_workbook(file_path)
     contents = [_get_content_from_sheet(i) for i in range(100)]
-    file_name = os.path.basename(file_path).rstrip(os.path.splitext(file_path)[-1])
+    file_name = os.path.basename(file_path).rstrip(os.path.splitext(file_path)[-1]) if name is None else name
     step_list = get_raw_data(contents, input_filter, file_name=file_name)
 
     return {'data': step_list}
 
 
-def open_raw_seq(file_path, input_filter=None):
+def open_raw_seq(file_path, input_filter=None, name=None):
 
     class RenameUnpickler(pickle.Unpickler):
         def find_class(self, module: str, name: str):

{ararpy-0.1.33 → ararpy-0.1.35}/ararpy/smp/diffusion_funcs.py

@@ -4436,7 +4436,7 @@ def get_random_dir(path: str, length=7, random_index=""):
     try:
         exist_ok = random_index != ""
         if random_index == "":
-            random_index = calc.basic.get_random_digits(length=length)
+            random_index = calc.basic.get_random_string(length=length)
         destination_folder = os.path.join(path, random_index)
         os.makedirs(destination_folder, exist_ok=exist_ok)
         return destination_folder, random_index

{ararpy-0.1.33 → ararpy-0.1.35}/ararpy/smp/export.py

@@ -23,7 +23,7 @@ from math import log
 from decimal import Decimal
 
 from ..calc import arr, isochron, spectra, err
-from ..calc.basic import get_random_digits, merge_dicts
+from ..calc.basic import get_random_string, merge_dicts
 from ..calc.plot import get_axis_scale
 from . import basic, sample, consts
 
@@ -329,8 +329,8 @@ def getRectFromSpectra(data):
 
 def _get_additional_text_series(name):
     return {
-        'type': 'text', 'id': f'text-{name}-{get_random_digits()}',
-        'name': f'text-{name}-{get_random_digits()}', 'color': 'black',
+        'type': 'text', 'id': f'text-{name}-{get_random_string()}',
+        'name': f'text-{name}-{get_random_string()}', 'color': 'black',
         'text': "", 'size': title_size,
         'data': [[50, 50]], 'axis_index': 1,
         'h_align': "middle", 'v_align': "center",
@@ -353,7 +353,7 @@ def _get_plot_data_age_spectra_series(smp: sample, **options):
     X = x + list(reversed(x))
     Y = y1 + list(reversed(y2))
     series.append({
-        'type': 'series.line', 'id': f'line-{smp.name()}-{get_random_digits()}', 'name': f'line-{smp.name()}-{get_random_digits()}',
+        'type': 'series.line', 'id': f'line-{smp.name()}-{get_random_string()}', 'name': f'line-{smp.name()}-{get_random_string()}',
         'color': color, 'fill_color': color, 'line_width': line_width, 'line_style': 'solid', 'z_index': 19,
         'data': np.transpose([X, Y]).tolist(),
         'line_caps': line_caps,
@@ -373,7 +373,7 @@ def _get_plot_data_age_spectra_series(smp: sample, **options):
             # spectra_fill_data = list(map(lambda each: [data[0][each - 1], min(data[1][each], data[2][each]), data[0][each + 1] - data[0][each], sigma * abs(data[1][each] - data[2][each])], selection))
             spectra_fill_data = getRectFromSpectra(plateau_data)
             series.append({
-                'type': 'series.rect', 'id': f'rect-{smp.name()}-{get_random_digits()}', 'name': f'rect-{smp.name()}-{get_random_digits()}',
+                'type': 'series.rect', 'id': f'rect-{smp.name()}-{get_random_string()}', 'name': f'rect-{smp.name()}-{get_random_string()}',
                 'color': [colors_map['red'], colors_map['blue']][index], 'fill_color': [colors_map['red'], colors_map['blue']][index],   'line_style': 'none', 'z_index': 9,
                 'data': spectra_fill_data, 'line_caps': 'none', 'fill': True,
                 'axis_index': 0,
@@ -382,8 +382,8 @@ def _get_plot_data_age_spectra_series(smp: sample, **options):
             X = x + list(reversed(x))
             Y = y1 + list(reversed(y2))
             series.append({
-                'type': 'series.line', 'id': f'line-{smp.name()}-{get_random_digits()}',
-                'name': f'line-{smp.name()}-{get_random_digits()}',
+                'type': 'series.line', 'id': f'line-{smp.name()}-{get_random_string()}',
+                'name': f'line-{smp.name()}-{get_random_string()}',
                 'color': [colors_map['red'], colors_map['blue']][index], 'line_width': line_width, 'line_style': 'solid', 'z_index': 9,
                 'data': np.transpose([X, Y]).tolist(),
                 'line_caps': line_caps,
@@ -392,8 +392,8 @@ def _get_plot_data_age_spectra_series(smp: sample, **options):
             })
             # plateau line
             series.append({
-                'type': 'series.line', 'id': f'line-{smp.name()}-{get_random_digits()}',
-                'name': f'line-{smp.name()}-{get_random_digits()}',
+                'type': 'series.line', 'id': f'line-{smp.name()}-{get_random_string()}',
+                'name': f'line-{smp.name()}-{get_random_string()}',
                 'color': '#A9A9A9', 'line_width': line_width, 'line_style': 'solid', 'z_index': 9,
                 'data': [[0, res['age']], [100, res['age']]],
                 'line_caps': line_caps,
@@ -401,7 +401,7 @@ def _get_plot_data_age_spectra_series(smp: sample, **options):
                 'axis_index': 0,
             })
             series.append({
-                'type': 'text', 'id': f'text-{smp.name()}-{get_random_digits()}', 'name': f'text-{smp.name()}-{get_random_digits()}',
+                'type': 'text', 'id': f'text-{smp.name()}-{get_random_string()}', 'name': f'text-{smp.name()}-{get_random_string()}',
                 'color': [colors_map['red'], colors_map['blue']][index], 'fill_color': [colors_map['red'], colors_map['blue']][index],
                 'text': f"Corrected = {res['age']:.2f} ± {(sigma * res['s2']):.2f} {unit} ({sigma}s)<r>"
                         f"MSWD = {res['MSWD']:.2f}, n = {res['Num']:.0f}<r>"
@@ -416,8 +416,8 @@ def _get_plot_data_age_spectra_series(smp: sample, **options):
         spe = smp.Info.results.age_spectra[index]
         if not np.isnan(res['age']):
             series.append({
-                'type': 'text', 'id': f'text-{smp.name()}-{get_random_digits()}',
-                'name': f'text-{smp.name()}-{get_random_digits()}',
+                'type': 'text', 'id': f'text-{smp.name()}-{get_random_string()}',
+                'name': f'text-{smp.name()}-{get_random_string()}',
                 'color': color, 'fill_color': color,
                 'text': f"WMPA = {spe['age']:.2f} ± {(sigma * spe['s2']):.2f} {unit} ({sigma}s)",
                 'size': title_size,
@@ -431,7 +431,7 @@ def _get_plot_data_age_spectra_series(smp: sample, **options):
     tga = smp.Info.results.age_spectra['TGA']
     if not np.isnan(tga['age']):
         series.append({
-            'type': 'text', 'id': f'text-{smp.name()}-{get_random_digits()}', 'name': f'text-{smp.name()}-{get_random_digits()}',
+            'type': 'text', 'id': f'text-{smp.name()}-{get_random_string()}', 'name': f'text-{smp.name()}-{get_random_string()}',
             'color': color, 'fill_color': color,
             'text': f"TGA = {tga['age']:.2f} ± {(sigma * tga['s2']):.2f} {unit} ({sigma}s)",
             'size': title_size,
@@ -455,7 +455,7 @@ def _get_plot_data_age_spectra_series(smp: sample, **options):
     # print(f"{min_index = }")
 
     series.append({
-        'type': 'text', 'id': f'text-{smp.name()}-{get_random_digits()}', 'name': f'text-{smp.name()}-{get_random_digits()}',
+        'type': 'text', 'id': f'text-{smp.name()}-{get_random_string()}', 'name': f'text-{smp.name()}-{get_random_string()}',
         'color': color, 'fill_color': color,
         'text': f"Max. = {age[max_index, 0]:.2f} ± {(sigma * age[max_index, 2]):.2f} {unit}",
         'size': title_size,
@@ -466,7 +466,7 @@ def _get_plot_data_age_spectra_series(smp: sample, **options):
     })
 
     series.append({
-        'type': 'text', 'id': f'text-{smp.name()}-{get_random_digits()}', 'name': f'text-{smp.name()}-{get_random_digits()}',
+        'type': 'text', 'id': f'text-{smp.name()}-{get_random_string()}', 'name': f'text-{smp.name()}-{get_random_string()}',
         'color': color, 'fill_color': color,
         'text': f"Min. = {age[min_index, 0]:.2f} ± {(sigma * age[min_index, 2]):.2f} {unit}",
         'size': title_size,
@@ -477,8 +477,8 @@ def _get_plot_data_age_spectra_series(smp: sample, **options):
     })
 
     series.append({
-        'type': 'series.line', 'id': f'line-{smp.name()}-{get_random_digits()}',
-        'name': f'line-{smp.name()}-{get_random_digits()}',
+        'type': 'series.line', 'id': f'line-{smp.name()}-{get_random_string()}',
+        'name': f'line-{smp.name()}-{get_random_string()}',
         'color': '#A9A9A9', 'line_width': line_width, 'line_style': 'solid', 'z_index': 9,
         'data': [[0, age[max_index, 0]], [100, age[max_index, 0]]],
         'line_caps': line_caps,
@@ -486,8 +486,8 @@ def _get_plot_data_age_spectra_series(smp: sample, **options):
         'axis_index': 0,
     })
     series.append({
-        'type': 'series.line', 'id': f'line-{smp.name()}-{get_random_digits()}',
-        'name': f'line-{smp.name()}-{get_random_digits()}',
+        'type': 'series.line', 'id': f'line-{smp.name()}-{get_random_string()}',
+        'name': f'line-{smp.name()}-{get_random_string()}',
         'color': '#A9A9A9', 'line_width': line_width, 'line_style': 'solid', 'z_index': 9,
         'data': [[0, age[min_index, 0]], [100, age[min_index, 0]]],
         'line_caps': line_caps,
@@ -496,8 +496,8 @@ def _get_plot_data_age_spectra_series(smp: sample, **options):
     })
     # title
     series.append({
-        'type': 'text', 'id': f'text-{smp.name()}-{get_random_digits()}',
-        'name': f'text-{smp.name()}-{get_random_digits()}', 'color': color,
+        'type': 'text', 'id': f'text-{smp.name()}-{get_random_string()}',
+        'name': f'text-{smp.name()}-{get_random_string()}', 'color': color,
         'text': smp.name(), 'size': title_size,
         'data': [[50, 95]], 'axis_index': 1, 'z_index': 29,
         'h_align': "middle", 'v_align': "center",
@@ -624,21 +624,21 @@ def _get_plot_data_inv_isochron_series(smp: sample, **options):
     set3 = smp.InvIsochronPlot.set3.data
     # set 1
     series.append({
-        'type': 'series.scatter', 'id': f'scatter-{smp.name()}-{get_random_digits()}', 'name': f'scatter-{smp.name()}-{get_random_digits()}',
+        'type': 'series.scatter', 'id': f'scatter-{smp.name()}-{get_random_string()}', 'name': f'scatter-{smp.name()}-{get_random_string()}',
         'stroke_color': colors_map['red'], 'fill_color': colors_map['red80'], 'myType': 'scatter', 'size': marker_size, 'line_width': 0,
         'data': (data[[0, 2], :][:, set1]).transpose().tolist(),
         'axis_index': 0, 'z_index': 99
     })
     # set 2
     series.append({
-        'type': 'series.scatter', 'id': f'scatter-{smp.name()}-{get_random_digits()}', 'name': f'scatter-{smp.name()}-{get_random_digits()}',
+        'type': 'series.scatter', 'id': f'scatter-{smp.name()}-{get_random_string()}', 'name': f'scatter-{smp.name()}-{get_random_string()}',
         'stroke_color': colors_map['blue'], 'fill_color': colors_map['blue80'], 'myType': 'scatter', 'size': marker_size, 'line_width': 0,
         'data': (data[[0, 2], :][:, set2]).transpose().tolist(),
         'axis_index': 0, 'z_index': 99
     })
     # set 3
     series.append({
-        'type': 'series.scatter', 'id': f'scatter-{smp.name()}-{get_random_digits()}', 'name': f'scatter-{smp.name()}-{get_random_digits()}',
+        'type': 'series.scatter', 'id': f'scatter-{smp.name()}-{get_random_string()}', 'name': f'scatter-{smp.name()}-{get_random_string()}',
         'stroke_color': 'black', 'fill_color': 'white', 'myType': 'scatter', 'size': marker_size, 'line_width': 0,
         'data': (data[[0, 2], :][:, set3]).transpose().tolist(),
         'axis_index': 0, 'z_index': 0
@@ -653,14 +653,14 @@ def _get_plot_data_inv_isochron_series(smp: sample, **options):
                             (float(xAxis[0]['extent'][1]), float(xAxis[0]['extent'][1]) * smp.Info.results.isochron['figure_3'][index]['m1'] + smp.Info.results.isochron['figure_3'][index]['k']),
             ]
             series.append({
-                'type': 'series.line', 'id': f'line-{smp.name()}-{get_random_digits()}', 'name': f'line-{smp.name()}-{get_random_digits()}',
+                'type': 'series.line', 'id': f'line-{smp.name()}-{get_random_string()}', 'name': f'line-{smp.name()}-{get_random_string()}',
                 'color': [colors_map['red'], colors_map['blue']][index], 'fill_color': [colors_map['red'], colors_map['blue']][index],
                 'line_width': 1, 'line_style': 'solid',
                 'data': isochron_data,
                 'axis_index': 0,
             })
             series.append({
-                'type': 'text', 'id': f'text-{smp.name()}-{get_random_digits()}', 'name': f'text-{smp.name()}-{get_random_digits()}',
+                'type': 'text', 'id': f'text-{smp.name()}-{get_random_string()}', 'name': f'text-{smp.name()}-{get_random_string()}',
                 'color': [colors_map['red'], colors_map['blue']][index], 'fill_color': [colors_map['red'], colors_map['blue']][index],
                 'text': f"IIA = {smp.Info.results.isochron['figure_3'][index]['age']:.2f} ± {(sigma * smp.Info.results.isochron['figure_3'][index]['s2']):.2f} Ma ({sigma}s)<r>"
                         f"(40Ar/36Ar)0 = {smp.Info.results.isochron['figure_3'][index]['initial']:.2f} ± {(sigma * smp.Info.results.isochron['figure_3'][index]['sinitial']):.2f}<r>"
@@ -673,8 +673,8 @@ def _get_plot_data_inv_isochron_series(smp: sample, **options):
             })
 
     series.append({
-        'type': 'text', 'id': f'text-{smp.name()}-{get_random_digits()}',
-        'name': f'text-{smp.name()}-{get_random_digits()}', 'color': color,
+        'type': 'text', 'id': f'text-{smp.name()}-{get_random_string()}',
+        'name': f'text-{smp.name()}-{get_random_string()}', 'color': color,
         'text': smp.name(), 'size': title_size,
         'data': [[50, 95]], 'axis_index': 1,
         'h_align': "middle", 'v_align': "center",
@@ -695,7 +695,7 @@ def _get_plot_data_degas_pattern(smp: sample, **options):
     data = np.array([x, y])
     # set 1
     series.append({
-        'type': 'series.scatter', 'id': f'scatter-{smp.name()}-{get_random_digits()}', 'name': f'scatter-{smp.name()}-{get_random_digits()}',
+        'type': 'series.scatter', 'id': f'scatter-{smp.name()}-{get_random_string()}', 'name': f'scatter-{smp.name()}-{get_random_string()}',
         'stroke_color': color, 'fill_color': 'white', 'myType': 'scatter', 'size': 4, 'line_width': 1,
         'data': data.transpose().tolist(), 'axis_index': 0, 'z_index': 99
     })
@@ -787,7 +787,7 @@ def _get_plot_data_degas_spectra_series(smp: sample, **options):
 
     # set 1
     series.append({
-        'type': 'rect', 'id': f'rect-{smp.name()}-{get_random_digits()}', 'name': f'rect-{smp.name()}-{get_random_digits()}',
+        'type': 'rect', 'id': f'rect-{smp.name()}-{get_random_string()}', 'name': f'rect-{smp.name()}-{get_random_string()}',
         'color': color, 'myType': 'rect', 'line_width': 1,
         'data': data.transpose().tolist(),
         'axis_index': 0, 'z_index': 99
@@ -844,13 +844,13 @@ def _get_plot_data_degas_curve_series(smp: sample, **options):
 
     # line
     series.append({
-        'type': 'line', 'id': f'line-{smp.name()}-{get_random_digits()}', 'name': f'line-{smp.name()}-{get_random_digits()}',
+        'type': 'line', 'id': f'line-{smp.name()}-{get_random_string()}', 'name': f'line-{smp.name()}-{get_random_string()}',
         'color': color, 'myType': 'line', 'line_width': 1, 'line_style': 'solid',
         'data': np.array([x, released]).transpose().tolist(),
         'axis_index': 0, 'z_index': 99
     })
     series.append({
-        'type': 'line', 'id': f'line-{smp.name()}-{get_random_digits()}', 'name': f'line-{smp.name()}-{get_random_digits()}',
+        'type': 'line', 'id': f'line-{smp.name()}-{get_random_string()}', 'name': f'line-{smp.name()}-{get_random_string()}',
         'color': color, 'myType': 'line', 'line_width': 1, 'line_style': 'solid',
         'data': np.array([x, remained]).transpose().tolist(),
         'axis_index': 0, 'z_index': 99

{ararpy-0.1.33 → ararpy-0.1.35}/ararpy/smp/plots.py

@@ -247,10 +247,10 @@ def get_isochron_results(data: list, smp: Sample, sequence, figure_type: int = 0
 
     if len(sequence) < 3:
         return iso_res
-    regression_method = {
-        "york-2": calc.regression.york2, "olst": calc.regression.olst
-    }.get(smp.TotalParam[97][min(sequence)].lower(), calc.regression.york2)
     try:
+        regression_method = {
+            "york-2": calc.regression.york2, "olst": calc.regression.olst
+        }.get(smp.TotalParam[97][min(sequence)].lower(), calc.regression.york2)
         regression_res = regression_method(*data[:5])
     except (Exception, BaseException):
         # print(f"Warning: {traceback.format_exc()}")

{ararpy-0.1.33 → ararpy-0.1.35}/ararpy/smp/raw.py

@@ -22,7 +22,7 @@ RawData = samples.RawData
 Sequence = samples.Sequence
 
 
-def to_raw(file_path: Union[str, List[str]], input_filter_path: Union[str, List[str]], **kwargs):
+def to_raw(file_path: Union[str, List[str]], input_filter_path: Union[str, List[str]], file_name=None, **kwargs):
     """ Read raw data from files, can create raw data instance based on the given files
     Raw data will have the structure like:
         [
@@ -35,6 +35,7 @@ def to_raw(file_path: Union[str, List[str]], input_filter_path: Union[str, List[
     ----------
     file_path
     input_filter_path
+    file_name
     kwargs
 
     Returns
@@ -42,21 +43,16 @@ def to_raw(file_path: Union[str, List[str]], input_filter_path: Union[str, List[
 
     """
     if isinstance(file_path, list) and isinstance(input_filter_path, list):
-        raw = concatenate([to_raw(file, input_filter_path[index]) for index, file in enumerate(file_path)])
+        raw = concatenate([to_raw(file, input_filter_path[index],
+            file_name[index] if isinstance(file_name, list) else file_name) for index, file in enumerate(file_path)])
     elif isinstance(file_path, str) and isinstance(input_filter_path, str):
         input_filter = read_params(input_filter_path)
-        file_name = str(os.path.split(file_path)[-1]).split('.')[0]
-        res = raw_file.open_file(file_path, input_filter)
+        file_name = str(os.path.split(file_path)[-1]).split('.')[0] if file_name is None else file_name
+        res = raw_file.open_file(file_path, input_filter, file_name)
         data = res.get('data', None)
         sequences = res.get('sequences', None)
         sequence_num = len(data) if data is not None else len(sequences)
-        # default fitting method, all exponential
-        # <option value=0>Linear</option>
-        # <option value=1>Quadratic</option>
-        # <option value=2>Exponential</option>
-        # <option value=3>Power</option>
-        # <option value=4>Average</option>
-        fitting_method = [2, 0, 2, 2, 2]
+        fitting_method = [2, 0, 2, 2, 2]  # 0 - linear, 1 - quadratic, 2 - exponential, 3 - power, 4 - average
         raw = RawData(name=file_name, data=data, isotopic_num=10, sequence_num=sequence_num, source=[file_path],
                       sequence=sequences, unit=str(input_filter[30]), fitting_method=[*fitting_method])
     else:

{ararpy-0.1.33 → ararpy-0.1.35}/ararpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ararpy
-Version: 0.1.33
+Version: 0.1.35
 Summary: A project for Ar-Ar geochronology
 Home-page: https://github.com/wuyangchn/ararpy.git
 Author: Yang Wu

{ararpy-0.1.33 → ararpy-0.1.35}/setup.py

@@ -16,7 +16,7 @@ long_description = (here / 'README.md').read_text(encoding='utf-8')
 
 setuptools.setup(
     name='ararpy',  #
-    version='0.1.33',  # version
+    version='0.1.35',  # version
     author='Yang Wu',
     author_email='wuycug@hotmail.com',
     description='A project for Ar-Ar geochronology',  # short description