easyscience 1.0.0__tar.gz → 1.1.0__tar.gz

{easyscience-1.0.0 → easyscience-1.1.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: easyscience
-Version: 1.0.0
+Version: 1.1.0
 Summary: Generic logic for easyScience libraries
-Project-URL: homepage, https://docs.easyscience.org
-Project-URL: documentation, https://docs.easyscience.org
+Project-URL: homepage, https://github.com/EasyScience/EasyScience
+Project-URL: documentation, https://easyscience.github.io/EasyScience/
 Author: EasyScience contributors
 License: BSD 3-Clause License
         
@@ -40,13 +40,12 @@ Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Scientific/Engineering
-Requires-Python: <3.12,>=3.8
+Requires-Python: <3.13,>=3.9
 Requires-Dist: asteval
 Requires-Dist: bumps
 Requires-Dist: dfo-ls
@@ -68,10 +67,9 @@ Requires-Dist: tox-gh-actions; extra == 'dev'
 Provides-Extra: docs
 Requires-Dist: doc8; extra == 'docs'
 Requires-Dist: readme-renderer; extra == 'docs'
-Requires-Dist: sphinx; extra == 'docs'
 Requires-Dist: sphinx-autodoc-typehints; extra == 'docs'
+Requires-Dist: sphinx-book-theme; extra == 'docs'
 Requires-Dist: sphinx-gallery; extra == 'docs'
-Requires-Dist: sphinx-rtd-theme; extra == 'docs'
 Requires-Dist: toml; extra == 'docs'
 Description-Content-Type: text/markdown
 

{easyscience-1.0.0 → easyscience-1.1.0}/pyproject.toml

@@ -21,14 +21,13 @@ classifiers = [
     "Topic :: Scientific/Engineering",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Development Status :: 3 - Alpha"
 ]
-requires-python = ">=3.8,<3.12"
+requires-python = ">=3.9,<3.13"
 dependencies = [
     "asteval",
     "bumps",
@@ -55,16 +54,15 @@ dev = [
 docs = [
     "doc8",
     "readme-renderer",
-    "Sphinx",
-    "sphinx-rtd-theme",
-    "sphinx-autodoc-typehints", 
-    "sphinx-gallery",
+    "sphinx_autodoc_typehints", 
+    "sphinx_book_theme",
+    "sphinx_gallery",
     "toml"
 ]
 
 [project.urls]
-homepage = "https://docs.easyscience.org"
-documentation = "https://docs.easyscience.org"
+homepage = "https://github.com/EasyScience/EasyScience"
+documentation = "https://easyscience.github.io/EasyScience/"
 
 [tool.hatch.version]
 path = "src/easyscience/__version__.py"
@@ -130,10 +128,9 @@ force-single-line = true
 legacy_tox_ini = """
 [tox]
 isolated_build = True
-envlist = py{3.8,3.9,3.10,3.11,3.12}
+envlist = py{3.9,3.10,3.11,3.12}
 [gh-actions]
 python =
-        3.8: py38
         3.9: py39
         3.10: py310
         3.11: py311

{easyscience-1.0.0 → easyscience-1.1.0}/src/easyscience/Objects/Groups.py

@@ -18,6 +18,7 @@ from typing import Tuple
 from typing import Union
 
 from easyscience.global_object.undo_redo import NotarizedDict
+from easyscience.Objects.new_variable.descriptor_base import DescriptorBase
 from easyscience.Objects.ObjectClasses import BasedBase
 from easyscience.Objects.ObjectClasses import Descriptor
 
@@ -40,6 +41,7 @@ class BaseCollection(BasedBase, MutableSequence):
         name: str,
         *args: Union[B, V],
         interface: Optional[iF] = None,
+        unique_name: Optional[str] = None,
         **kwargs,
     ):
         """
@@ -51,7 +53,7 @@ class BaseCollection(BasedBase, MutableSequence):
         :param _kwargs: Fields which this class should contain
         :type _kwargs: dict
         """
-        BasedBase.__init__(self, name)
+        BasedBase.__init__(self, name, unique_name=unique_name)
         kwargs = {key: kwargs[key] for key in kwargs.keys() if kwargs[key] is not None}
         _args = []
         for item in args:
@@ -67,7 +69,7 @@ class BaseCollection(BasedBase, MutableSequence):
                 _kwargs[key] = item
         kwargs = _kwargs
         for item in list(kwargs.values()) + _args:
-            if not issubclass(type(item), (Descriptor, BasedBase)):
+            if not issubclass(type(item), (Descriptor, DescriptorBase, BasedBase)):
                 raise AttributeError('A collection can only be formed from easyscience objects.')
         args = _args
         _kwargs = {}
@@ -83,10 +85,11 @@ class BaseCollection(BasedBase, MutableSequence):
         for key in kwargs.keys():
             if key in self.__dict__.keys() or key in self.__slots__:
                 raise AttributeError(f'Given kwarg: `{key}`, is an internal attribute. Please rename.')
-            self._global_object.map.add_edge(self, kwargs[key])
-            self._global_object.map.reset_type(kwargs[key], 'created_internal')
-            if interface is not None:
-                kwargs[key].interface = interface
+            if kwargs[key]:  # Might be None (empty tuple or list)
+                self._global_object.map.add_edge(self, kwargs[key])
+                self._global_object.map.reset_type(kwargs[key], 'created_internal')
+                if interface is not None:
+                    kwargs[key].interface = interface
             # TODO wrap getter and setter in Logger
         if interface is not None:
             self.interface = interface
@@ -104,7 +107,7 @@ class BaseCollection(BasedBase, MutableSequence):
         :rtype: None
         """
         t_ = type(value)
-        if issubclass(t_, (BasedBase, Descriptor)):
+        if issubclass(t_, (BasedBase, Descriptor, DescriptorBase)):
             update_key = list(self._kwargs.keys())
             values = list(self._kwargs.values())
             # Update the internal dict
@@ -165,7 +168,7 @@ class BaseCollection(BasedBase, MutableSequence):
         if isinstance(value, Number):  # noqa: S3827
             item = self.__getitem__(key)
             item.value = value
-        elif issubclass(type(value), BasedBase) or issubclass(type(value), Descriptor):
+        elif issubclass(type(value), (BasedBase, Descriptor, DescriptorBase)):
             update_key = list(self._kwargs.keys())
             values = list(self._kwargs.values())
             old_item = values[key]

{easyscience-1.0.0 → easyscience-1.1.0}/src/easyscience/Objects/ObjectClasses.py

@@ -28,7 +28,7 @@ from .Variable import Descriptor
 from .Variable import Parameter
 
 if TYPE_CHECKING:
-    from easyscience.fitting.Constraints import C
+    from easyscience.Constraints import C
     from easyscience.Objects.Inferface import iF
     from easyscience.Objects.Variable import V
 
@@ -186,7 +186,7 @@ class BasedBase(ComponentSerializer):
         for key, item in self._kwargs.items():
             if hasattr(item, '_get_linkable_attributes'):
                 item_list = [*item_list, *item._get_linkable_attributes()]
-            elif issubclass(type(item), Descriptor) or issubclass(type(item), DescriptorBase):
+            elif issubclass(type(item), (Descriptor, DescriptorBase)):
                 item_list.append(item)
         return item_list
 
@@ -215,6 +215,12 @@ class BasedBase(ComponentSerializer):
         new_class_objs = list(k for k in dir(self.__class__) if not k.startswith('_'))
         return sorted(new_class_objs)
 
+    def __copy__(self) -> BasedBase:
+        """Return a copy of the object."""
+        temp = self.as_dict(skip=['unique_name'])
+        new_obj = self.__class__.from_dict(temp)
+        return new_obj
+
 
 if TYPE_CHECKING:
     B = TypeVar('B', bound=BasedBase)
@@ -346,7 +352,9 @@ class BaseObj(BasedBase):
     @staticmethod
     def __setter(key: str) -> Callable[[BV], None]:
         def setter(obj: BV, value: float) -> None:
-            if issubclass(obj._kwargs[key].__class__, Descriptor) and not issubclass(value.__class__, Descriptor):
+            if issubclass(obj._kwargs[key].__class__, (Descriptor, DescriptorBase)) and not issubclass(
+                value.__class__, (Descriptor, DescriptorBase)
+            ):
                 obj._kwargs[key].value = value
             else:
                 obj._kwargs[key] = value

{easyscience-1.0.0 → easyscience-1.1.0}/src/easyscience/Objects/Variable.py

@@ -30,14 +30,14 @@ import numpy as np
 from easyscience import global_object
 from easyscience import pint
 from easyscience import ureg
-from easyscience.fitting.Constraints import SelfConstraint
+from easyscience.Constraints import SelfConstraint
 from easyscience.global_object.undo_redo import property_stack_deco
 from easyscience.Objects.core import ComponentSerializer
 from easyscience.Utils.classTools import addProp
 from easyscience.Utils.Exceptions import CoreSetException
 
 if TYPE_CHECKING:
-    from easyscience.fitting.Constraints import C
+    from easyscience.Constraints import C
 
 Q_ = ureg.Quantity
 M_ = ureg.Measurement

easyscience-1.1.0/src/easyscience/Objects/new_variable/__init__.py

@@ -0,0 +1,11 @@
+from .descriptor_bool import DescriptorBool
+from .descriptor_number import DescriptorNumber
+from .descriptor_str import DescriptorStr
+from .parameter import Parameter
+
+__all__ = [
+    DescriptorBool,
+    DescriptorNumber,
+    DescriptorStr,
+    Parameter,
+]

{easyscience-1.0.0 → easyscience-1.1.0}/src/easyscience/Objects/new_variable/descriptor_base.py

@@ -27,7 +27,6 @@ class DescriptorBase(ComponentSerializer, metaclass=abc.ABCMeta):
     # Used by serializer
     _REDIRECT = {'parent': None}
 
-    _global_object = global_object
 
     def __init__(
         self,
@@ -55,7 +54,7 @@ class DescriptorBase(ComponentSerializer, metaclass=abc.ABCMeta):
         """
 
         if unique_name is None:
-            unique_name = self._global_object.generate_unique_name(self.__class__.__name__)
+            unique_name = global_object.generate_unique_name(self.__class__.__name__)
         self._unique_name = unique_name
 
         if not isinstance(name, str):
@@ -80,10 +79,10 @@ class DescriptorBase(ComponentSerializer, metaclass=abc.ABCMeta):
 
         # Let the collective know we've been assimilated
         self._parent = parent
-        self._global_object.map.add_vertex(self, obj_type='created')
+        global_object.map.add_vertex(self, obj_type='created')
         # Make the connection between self and parent
         if parent is not None:
-            self._global_object.map.add_edge(parent, self)
+            global_object.map.add_edge(parent, self)
 
     @property
     def name(self) -> str:
@@ -187,7 +186,7 @@ class DescriptorBase(ComponentSerializer, metaclass=abc.ABCMeta):
         if not isinstance(new_unique_name, str):
             raise TypeError('Unique name has to be a string.')
         self._unique_name = new_unique_name
-        self._global_object.map.add_vertex(self)
+        global_object.map.add_vertex(self)
 
     @property
     @abc.abstractmethod
@@ -205,7 +204,6 @@ class DescriptorBase(ComponentSerializer, metaclass=abc.ABCMeta):
 
     def __copy__(self) -> DescriptorBase:
         """Return a copy of the object."""
-        temp = self.as_dict()
-        temp['unique_name'] = None
+        temp = self.as_dict(skip=['unique_name'])
         new_obj = self.__class__.from_dict(temp)
         return new_obj

{easyscience-1.0.0 → easyscience-1.1.0}/src/easyscience/Objects/new_variable/descriptor_number.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import numbers
 from typing import Any
 from typing import Dict
+from typing import List
 from typing import Optional
 from typing import Union
 
@@ -89,7 +90,6 @@ class DescriptorNumber(DescriptorBase):
             raise TypeError(f'{full_value=} must be a scipp scalar')
         return cls(name=name, value=full_value.value, unit=full_value.unit, variance=full_value.variance, **kwargs)
 
-
     @property
     def full_value(self) -> Variable:
         """
@@ -101,8 +101,10 @@ class DescriptorNumber(DescriptorBase):
 
     @full_value.setter
     def full_value(self, full_value: Variable) -> None:
-        raise AttributeError(f'Full_value is read-only. Change the value and variance seperately. Or create a new {self.__class__.__name__}.')  # noqa: E501
-    
+        raise AttributeError(
+            f'Full_value is read-only. Change the value and variance seperately. Or create a new {self.__class__.__name__}.'
+        )
+
     @property
     def value(self) -> numbers.Number:
         """
@@ -135,7 +137,12 @@ class DescriptorNumber(DescriptorBase):
 
     @unit.setter
     def unit(self, unit_str: str) -> None:
-        raise AttributeError(f'Unit is read-only. Use convert_unit to change the unit between allowed types or create a new {self.__class__.__name__} with the desired unit.')  # noqa: E501
+        raise AttributeError(
+            (
+                f'Unit is read-only. Use convert_unit to change the unit between allowed types '
+                f'or create a new {self.__class__.__name__} with the desired unit.'
+            )
+        )  # noqa: E501
 
     @property
     def variance(self) -> float:
@@ -162,7 +169,6 @@ class DescriptorNumber(DescriptorBase):
             variance_float = float(variance_float)
         self._scalar.variance = variance_float
 
-
     @property
     def error(self) -> float:
         """
@@ -205,94 +211,92 @@ class DescriptorNumber(DescriptorBase):
     # Just to get return type right
     def __copy__(self) -> DescriptorNumber:
         return super().__copy__()
-   
+
     def __repr__(self) -> str:
         """Return printable representation."""
-        string='<'
-        string+= self.__class__.__name__+' '
-        string+=f"'{self._name}': "
-        string+= f'{self._scalar.value:.4f}'
+        string = '<'
+        string += self.__class__.__name__ + ' '
+        string += f"'{self._name}': "
+        string += f'{self._scalar.value:.4f}'
         if self.variance:
-            string += f' \u00B1 {self.error:.4f}'
+            string += f' \u00b1 {self.error:.4f}'
         obj_unit = self._scalar.unit
         if obj_unit == 'dimensionless':
             obj_unit = ''
         else:
             obj_unit = f' {obj_unit}'
-        string+= obj_unit
-        string+='>'
+        string += obj_unit
+        string += '>'
         return string
         # return f"<{class_name} '{obj_name}': {obj_value:0.04f}{obj_unit}>"
 
-    def as_dict(self) -> Dict[str, Any]:
-        raw_dict = super().as_dict()
+    def as_dict(self, skip: Optional[List[str]] = None) -> Dict[str, Any]:
+        raw_dict = super().as_dict(skip=skip)
         raw_dict['value'] = self._scalar.value
         raw_dict['unit'] = str(self._scalar.unit)
         raw_dict['variance'] = self._scalar.variance
         return raw_dict
-    
+
     def __add__(self, other: Union[DescriptorNumber, numbers.Number]) -> DescriptorNumber:
         if isinstance(other, numbers.Number):
             if self.unit != 'dimensionless':
-                raise UnitError("Numbers can only be added to dimensionless values")
-            new_value = self.full_value  + other
+                raise UnitError('Numbers can only be added to dimensionless values')
+            new_value = self.full_value + other
         elif type(other) is DescriptorNumber:
             original_unit = other.unit
             try:
                 other.convert_unit(self.unit)
             except UnitError:
-                raise UnitError(f"Values with units {self.unit} and {other.unit} cannot be added") from None
+                raise UnitError(f'Values with units {self.unit} and {other.unit} cannot be added') from None
             new_value = self.full_value + other.full_value
             other.convert_unit(original_unit)
         else:
             return NotImplemented
-        descriptor_number= DescriptorNumber.from_scipp(name=self.name, full_value=new_value)
-        descriptor_number.name=descriptor_number.unique_name
+        descriptor_number = DescriptorNumber.from_scipp(name=self.name, full_value=new_value)
+        descriptor_number.name = descriptor_number.unique_name
         return descriptor_number
-    
-    
 
     def __radd__(self, other: numbers.Number) -> DescriptorNumber:
         if isinstance(other, numbers.Number):
             if self.unit != 'dimensionless':
-                raise UnitError("Numbers can only be added to dimensionless values")
+                raise UnitError('Numbers can only be added to dimensionless values')
             new_value = other + self.full_value
         else:
             return NotImplemented
-        descriptor_number= DescriptorNumber.from_scipp(name=self.name, full_value=new_value)
-        descriptor_number.name=descriptor_number.unique_name
+        descriptor_number = DescriptorNumber.from_scipp(name=self.name, full_value=new_value)
+        descriptor_number.name = descriptor_number.unique_name
         return descriptor_number
 
     def __sub__(self, other: Union[DescriptorNumber, numbers.Number]) -> DescriptorNumber:
         if isinstance(other, numbers.Number):
             if self.unit != 'dimensionless':
-                raise UnitError("Numbers can only be subtracted from dimensionless values")
+                raise UnitError('Numbers can only be subtracted from dimensionless values')
             new_value = self.full_value - other
         elif type(other) is DescriptorNumber:
             original_unit = other.unit
             try:
                 other.convert_unit(self.unit)
             except UnitError:
-                raise UnitError(f"Values with units {self.unit} and {other.unit} cannot be subtracted") from None
+                raise UnitError(f'Values with units {self.unit} and {other.unit} cannot be subtracted') from None
             new_value = self.full_value - other.full_value
             other.convert_unit(original_unit)
         else:
             return NotImplemented
-        descriptor_number= DescriptorNumber.from_scipp(name=self.name, full_value=new_value)
-        descriptor_number.name=descriptor_number.unique_name
+        descriptor_number = DescriptorNumber.from_scipp(name=self.name, full_value=new_value)
+        descriptor_number.name = descriptor_number.unique_name
         return descriptor_number
-        
+
     def __rsub__(self, other: numbers.Number) -> DescriptorNumber:
         if isinstance(other, numbers.Number):
             if self.unit != 'dimensionless':
-                raise UnitError("Numbers can only be subtracted from dimensionless values")
+                raise UnitError('Numbers can only be subtracted from dimensionless values')
             new_value = other - self.full_value
         else:
             return NotImplemented
-        descriptor= DescriptorNumber.from_scipp(name=self.name, full_value=new_value)
-        descriptor.name=descriptor.unique_name
+        descriptor = DescriptorNumber.from_scipp(name=self.name, full_value=new_value)
+        descriptor.name = descriptor.unique_name
         return descriptor
-    
+
     def __mul__(self, other: Union[DescriptorNumber, numbers.Number]) -> DescriptorNumber:
         if isinstance(other, numbers.Number):
             new_value = self.full_value * other
@@ -302,46 +306,46 @@ class DescriptorNumber(DescriptorBase):
             return NotImplemented
         descriptor_number = DescriptorNumber.from_scipp(name=self.name, full_value=new_value)
         descriptor_number.convert_unit(descriptor_number._base_unit())
-        descriptor_number.name=descriptor_number.unique_name
+        descriptor_number.name = descriptor_number.unique_name
         return descriptor_number
-        
+
     def __rmul__(self, other: numbers.Number) -> DescriptorNumber:
         if isinstance(other, numbers.Number):
             new_value = other * self.full_value
         else:
             return NotImplemented
-        descriptor_number= DescriptorNumber.from_scipp(name=self.name, full_value=new_value)
-        descriptor_number.name=descriptor_number.unique_name
+        descriptor_number = DescriptorNumber.from_scipp(name=self.name, full_value=new_value)
+        descriptor_number.name = descriptor_number.unique_name
         return descriptor_number
-    
+
     def __truediv__(self, other: Union[DescriptorNumber, numbers.Number]) -> DescriptorNumber:
         if isinstance(other, numbers.Number):
             original_other = other
             if other == 0:
-                raise ZeroDivisionError("Cannot divide by zero")
+                raise ZeroDivisionError('Cannot divide by zero')
             new_value = self.full_value / other
         elif type(other) is DescriptorNumber:
             original_other = other.value
             if original_other == 0:
-                raise ZeroDivisionError("Cannot divide by zero")
+                raise ZeroDivisionError('Cannot divide by zero')
             new_value = self.full_value / other.full_value
             other.value = original_other
         else:
             return NotImplemented
         descriptor_number = DescriptorNumber.from_scipp(name=self.name, full_value=new_value)
         descriptor_number.convert_unit(descriptor_number._base_unit())
-        descriptor_number.name=descriptor_number.unique_name
+        descriptor_number.name = descriptor_number.unique_name
         return descriptor_number
-    
+
     def __rtruediv__(self, other: numbers.Number) -> DescriptorNumber:
         if isinstance(other, numbers.Number):
             if self.value == 0:
-                raise ZeroDivisionError("Cannot divide by zero")
+                raise ZeroDivisionError('Cannot divide by zero')
             new_value = other / self.full_value
         else:
             return NotImplemented
-        descriptor_number= DescriptorNumber.from_scipp(name=self.name, full_value=new_value)
-        descriptor_number.name=descriptor_number.unique_name
+        descriptor_number = DescriptorNumber.from_scipp(name=self.name, full_value=new_value)
+        descriptor_number.name = descriptor_number.unique_name
         return descriptor_number
 
     def __pow__(self, other: Union[DescriptorNumber, numbers.Number]) -> DescriptorNumber:
@@ -349,51 +353,51 @@ class DescriptorNumber(DescriptorBase):
             exponent = other
         elif type(other) is DescriptorNumber:
             if other.unit != 'dimensionless':
-                raise UnitError("Exponents must be dimensionless")
+                raise UnitError('Exponents must be dimensionless')
             if other.variance is not None:
-                raise ValueError("Exponents must not have variance")
+                raise ValueError('Exponents must not have variance')
             exponent = other.value
         else:
             return NotImplemented
         try:
-            new_value = self.full_value ** exponent
+            new_value = self.full_value**exponent
         except Exception as message:
             raise message from None
         if np.isnan(new_value.value):
-            raise ValueError("The result of the exponentiation is not a number")
-        descriptor_number= DescriptorNumber.from_scipp(name=self.name, full_value=new_value)
-        descriptor_number.name=descriptor_number.unique_name
+            raise ValueError('The result of the exponentiation is not a number')
+        descriptor_number = DescriptorNumber.from_scipp(name=self.name, full_value=new_value)
+        descriptor_number.name = descriptor_number.unique_name
         return descriptor_number
-    
+
     def __rpow__(self, other: numbers.Number) -> numbers.Number:
         if isinstance(other, numbers.Number):
             if self.unit != 'dimensionless':
-                raise UnitError("Exponents must be dimensionless")
+                raise UnitError('Exponents must be dimensionless')
             if self.variance is not None:
-                raise ValueError("Exponents must not have variance")
-            new_value = other ** self.value
+                raise ValueError('Exponents must not have variance')
+            new_value = other**self.value
         else:
             return NotImplemented
         return new_value
 
     def __neg__(self) -> DescriptorNumber:
         new_value = -self.full_value
-        descriptor_number= DescriptorNumber.from_scipp(name=self.name, full_value=new_value)
-        descriptor_number.name=descriptor_number.unique_name
+        descriptor_number = DescriptorNumber.from_scipp(name=self.name, full_value=new_value)
+        descriptor_number.name = descriptor_number.unique_name
         return descriptor_number
-    
+
     def __abs__(self) -> DescriptorNumber:
         new_value = abs(self.full_value)
-        descriptor_number= DescriptorNumber.from_scipp(name=self.name, full_value=new_value)
-        descriptor_number.name=descriptor_number.unique_name
+        descriptor_number = DescriptorNumber.from_scipp(name=self.name, full_value=new_value)
+        descriptor_number.name = descriptor_number.unique_name
         return descriptor_number
 
     def _base_unit(self) -> str:
         string = str(self._scalar.unit)
         for i, letter in enumerate(string):
-            if letter == "e":
-                if string[i:i+2] not in ["e+", "e-"]:
+            if letter == 'e':
+                if string[i : i + 2] not in ['e+', 'e-']:
                     return string[i:]
-            elif letter not in ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ".", "+", "-"]:
+            elif letter not in ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '.', '+', '-']:
                 return string[i:]
-        return ""
+        return ''