radnn 0.0.8__py3-none-any.whl → 0.0.9__py3-none-any.whl

radnn/__init__.py

@@ -3,8 +3,9 @@
 # Version 0.0.6    [2025-02-04]
 # Version 0.0.7.2  [2025-02-17]
 # Version 0.0.7.3  [2025-02-21]
-# Version 0.0.8    [2025-02-xx]
-__version__ = "0.0.8"
+# Version 0.0.8    [2025-02-25]
+# Version 0.0.9    [2025-03-xx]
+__version__ = "0.0.9"
 
 from .system import FileStore, FileSystem
 from .ml_system import MLSystem

radnn/data/dataset_base.py

@@ -236,7 +236,7 @@ class DataSetBase(object):
   def has_cache(self, samples_file_prefix="Samples"):
     return self.filestore.exists("%s.pkl" % samples_file_prefix) or self.filestore.exists("%s.TS.pkl" % samples_file_prefix)
   # --------------------------------------------------------------------------------------------------------------------
-  def load_cache(self, filestore: FileStore = None, samples_file_prefix="Samples", targets_file_prefix="Labels", is_verbose=False):
+  def load_cache(self, filestore: FileStore = None, samples_file_prefix="Samples", targets_file_prefix="Labels", ids_file_prefix="Ids", is_verbose=False):
     if filestore is None:
       filestore = self.filestore
     if filestore is None:
@@ -258,30 +258,39 @@ class DataSetBase(object):
 
       self.samples   = filestore.obj.load("%s.pkl" % samples_file_prefix)
       self.labels    = filestore.obj.load("%s.pkl" % targets_file_prefix)
-    
+
       if is_verbose:
         print("Loading training set ...")      
       nTSSamples  = filestore.obj.load("%s.TS.pkl" % samples_file_prefix)
       nTSTargets   = filestore.obj.load("%s.TS.pkl" % targets_file_prefix)
       self.assign_training_set(nTSSamples, nTSTargets)
-      
+      nTSIDs = filestore.obj.load("%s.TS.pkl" % ids_file_prefix)
+      if nTSIDs is not None:
+        self.ts_sample_ids = nTSIDs
+
       if is_verbose:
         print("Loading validation set ...")            
       nVSSamples  = filestore.obj.load("%s.VS.pkl" % samples_file_prefix)
       nVSTargets  = filestore.obj.load("%s.VS.pkl" % targets_file_prefix)
       self.assign_validation_set(nVSSamples, nVSTargets)
-      
+      nVSIds = filestore.obj.load("%s.VS.pkl" % ids_file_prefix)
+      if nVSIds is not None:
+        self.vs_sample_ids = nVSIds
+
       if is_verbose:
         print("Loading unknown test data set ...")            
       nUTSamples  = filestore.obj.load("%s.UT.pkl" % samples_file_prefix)
       if nUTSamples is not None:
         nUTTargets   = filestore.obj.load("%s.UT.pkl" % targets_file_prefix)
         self.assign_unknown_test_set(nUTSamples, nUTTargets)
+      nUTIds = filestore.obj.load("%s.UT.pkl" % ids_file_prefix)
+      if nUTIds is not None:
+        self.ut_sample_ids = nUTIds
 
 
     return bResult
   # --------------------------------------------------------------------------------------------------------------------
-  def save_cache(self, filestore: FileStore = None, samples_file_prefix="Samples", targets_file_prefix="Labels"):
+  def save_cache(self, filestore: FileStore = None, samples_file_prefix="Samples", targets_file_prefix="Labels", ids_file_prefix="Ids"):
     if filestore is None:
       filestore = self.filestore
     if filestore is None:
@@ -293,13 +302,16 @@ class DataSetBase(object):
 
     filestore.obj.save(self.ts_samples, "%s.TS.pkl" % samples_file_prefix, is_overwriting=True)
     filestore.obj.save(self.ts_labels, "%s.TS.pkl" % targets_file_prefix, is_overwriting=True)
+    filestore.obj.save(self.ts_sample_ids, "%s.TS.pkl" % ids_file_prefix, is_overwriting=True)
 
     filestore.obj.save(self.vs_samples, "%s.VS.pkl" % samples_file_prefix, is_overwriting=True)
     filestore.obj.save(self.vs_labels, "%s.VS.pkl" % targets_file_prefix, is_overwriting=True)
+    filestore.obj.save(self.vs_sample_ids, "%s.VS.pkl" % ids_file_prefix, is_overwriting=True)
 
     if self.ut_samples is not None:
       filestore.obj.save(self.ut_samples, "%s.UT.pkl" % samples_file_prefix, is_overwriting=True)
       filestore.obj.save(self.ut_labels, "%s.UT.pkl" % targets_file_prefix, is_overwriting=True)
+      filestore.obj.save(self.ut_sample_ids, "%s.UT.pkl" % ids_file_prefix, is_overwriting=True)
 
     self.card["name"] = self.name
     if self.feature_count is not None:

radnn/system/files/jsonfile.py

@@ -32,6 +32,9 @@ import json
 import glob
 from .fileobject import FileObject
 
+#TODO: jsonpickle
+#https://stackoverflow.com/questions/3768895/how-to-make-a-class-json-serializable
+
 class JSONFile(FileObject):
   # ----------------------------------------------------------------------------------
   def __init__(self, filename, parent_folder=None, error_template=None):

radnn/system/files/textfile.py

@@ -43,24 +43,24 @@ class TextFile(FileObject):
   def load(self, filename=None, encoding=None):
     filename = self._useFileName(filename)
 
-    oEncodingToTry = ["utf-8", "utf-16", "latin1", "ascii"]  # Add more if needed
-
     sText = None
-    if encoding is None:
-      bIsLoaded = False
-      for sEnc in oEncodingToTry:
-        try:
-          with open(filename, "r", encoding=sEnc) as oFile:
-            sText = oFile.read()
-          bIsLoaded = True
-          break
-        except (UnicodeDecodeError, UnicodeError):
-          continue
-      if not bIsLoaded:
-        raise ValueError("Unsupported encoding")
-    else:
-      with open(filename, "r", encoding=encoding) as oFile:
-        sText = oFile.read()
+    if os.path.isfile(filename):
+      oEncodingToTry = ["utf-8", "utf-16", "latin1", "ascii"]  # Add more if needed
+      if encoding is None:
+        bIsLoaded = False
+        for sEnc in oEncodingToTry:
+          try:
+            with open(filename, "r", encoding=sEnc) as oFile:
+              sText = oFile.read()
+            bIsLoaded = True
+            break
+          except (UnicodeDecodeError, UnicodeError):
+            continue
+        if not bIsLoaded:
+          raise ValueError("Unsupported encoding")
+      else:
+        with open(filename, "r", encoding=encoding) as oFile:
+          sText = oFile.read()
 
     return sText
   # --------------------------------------------------------------------------------------------------------------------
@@ -74,9 +74,6 @@ class TextFile(FileObject):
         p_sFileName        : Full path to the text file
         p_sText            : Text to write
     """
-    if (self.parent_folder is not None):
-      sFilename = os.path.join(self.parent_folder, sFilename)
-
     if self.is_verbose:
       print("  {.} Saving text to %s" % sFilename)
 

{radnn-0.0.8.dist-info → radnn-0.0.9.dist-info}/METADATA

@@ -1,35 +1,13 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: radnn
-Version: 0.0.8
+Version: 0.0.9
 Summary: Rapid Deep Neural Networks
 Author-email: "Pantelis I. Kaplanoglou" <pikaplanoglou@ihu.gr>
-License: MIT License
-        
-        Copyright (c) 2017-2025 Pantelis I. Kaplanoglou
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-        SOFTWARE.
-        
+License-Expression: MIT
 Project-URL: Homepage, https://github.com/pikaplan/radnn
 Project-URL: Documentation, https://radnn.readthedocs.io/
 Classifier: Intended Audience :: Science/Research
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python
 Classifier: Topic :: Software Development
 Classifier: Topic :: Scientific/Engineering
@@ -47,6 +25,7 @@ Requires-Dist: numpy>=1.26.4
 Requires-Dist: matplotlib>=3.8.4
 Requires-Dist: pandas>=2.2.1
 Requires-Dist: scikit-learn>=1.4.2
+Dynamic: license-file
 
 # radnn - Rapid Deep Neural Networks
 

{radnn-0.0.8.dist-info → radnn-0.0.9.dist-info}/RECORD

@@ -1,11 +1,11 @@
-radnn/__init__.py,sha256=G0PsHmid1DPmViG5S9h4MZpTlVZuv6QOUifmK8PHhb8,396
+radnn/__init__.py,sha256=uknFzhEVVS5y1sy4AeAc6YGb2t5ZulzG7muKMXwrT-A,429
 radnn/core.py,sha256=-v25_yJyioyH_juGPJLWvKojwkdy4AF2TuWMPcnqjDA,4565
 radnn/errors.py,sha256=gFiJYngMO24BApzd1auSBNASeS238MAmG3tubCr0POU,1716
 radnn/ml_system.py,sha256=ycd9y26br7TvIWE39X6DBJ5jEU8A_6fmwr9F4htK8mI,5927
 radnn/utils.py,sha256=7WY0c0ZalfE4XJJuolK-KgW4FFEBL4HfiLuaEAJGVt4,7675
 radnn/data/__init__.py,sha256=IExy6eV9QSr3b2LaI3cND7P4W-kPHivHMleJsKETh00,405
 radnn/data/data_feed.py,sha256=Hb8eROxZ7OFJ9a4-CM6Dibbx7v46QbkoiSIAjwCfs1Y,7290
-radnn/data/dataset_base.py,sha256=VRGlXZhcBb7i5p39GbqUjau12UxPb2kwBVQTZTVG-WI,15184
+radnn/data/dataset_base.py,sha256=fuYFFypHzYnH3CWb1psfXdjTuU_YRCEaJuotUtpEufk,15903
 radnn/data/dataset_folder.py,sha256=-6dL61ptVpHyMf1hc7B87w6oaLrZYOY6CGJVBkmhqp8,2475
 radnn/data/image_dataset.py,sha256=2TOKXKml0qzj1CvMfJdMMjE3QhquCD-lZIsttFDuBoM,4516
 radnn/data/image_dataset_files.py,sha256=9CLIu44MYq6LIU58o-qxqPucnXxRq4rQnAwTAYFuJ3c,7508
@@ -50,9 +50,9 @@ radnn/system/files/csvfile.py,sha256=xoV0tGKDKlIq20P7-9NQ2Pq0rX3XrM-fTgumWN-uHmI
 radnn/system/files/filelist.py,sha256=HsyBUtDSKmo_aGfezIvmLqtCCbH-y7Ybv03Tb1ZZKO4,2042
 radnn/system/files/fileobject.py,sha256=nHz0JumwsO_T9BNLbCzkhca6i5ScweYuIenhpaLAovo,4095
 radnn/system/files/imgfile.py,sha256=B752yCxnHcJDwC7qognZ6zLKnqXcEUUuMrUEglXkXT8,2484
-radnn/system/files/jsonfile.py,sha256=bjS1gnM1QMAP7zmCTGWq3-Z86iwdIq20mk58-guKBMQ,3533
+radnn/system/files/jsonfile.py,sha256=BOyVUkpPMS23f6WamcIyEIvX9PeH0os-nydmNpC0s80,3638
 radnn/system/files/picklefile.py,sha256=n362cyoxwZtANJwuu8xHWDLttqNY4QqwDR1Jh-2VwUk,5768
-radnn/system/files/textfile.py,sha256=9wdubEW9tVEwA1-s1n3UtabW7-QTjSdUBIe_rdSyWVA,4001
+radnn/system/files/textfile.py,sha256=si8BgszEFNhW_XKgF7sS_6wgpSdHTEUvtXQgIS88a7M,3958
 radnn/system/hosts/__init__.py,sha256=k2gkMJhe96Nf-V2ex6jZqmCRX9vA_K6gFB8J8Ii9ahc,261
 radnn/system/hosts/colab_host.py,sha256=i0s43KjdJ-gjLGyQAItubz2gZvOj-DbFnH1EGYguoVk,4000
 radnn/system/hosts/linux_host.py,sha256=AuOTpQ3OB1SXvsS1F-ksLVL44HXeRz5UEM2jbQ_1nbg,1623
@@ -63,8 +63,8 @@ radnn/system/threads/thread_context.py,sha256=wbRmeIoJSZaLH6Z_Gra-X2uqYLmMFL7ZLp
 radnn/system/threads/thread_safe_queue.py,sha256=rtOoflj7lXeYAbISTU36ftYNcv0bgT8c4_Fs4qFfslU,6216
 radnn/system/threads/thread_safe_string_collection.py,sha256=vdRMvwJ8CcLmsJ1uildoNjJ5OYruWyGRlCr7amtMUeU,2391
 radnn/system/threads/thread_worker.py,sha256=5KANBBHwnyaMvjyelBT1eyZCzRtH7MNZiHUhN1Xl1BY,3466
-radnn-0.0.8.dist-info/LICENSE.txt,sha256=vYtt_GDvm_yW65X9YMBOOu8Vqc9SAvqH94TbfBc2ckU,1106
-radnn-0.0.8.dist-info/METADATA,sha256=65_TJ_G3vNVqL2DVVPk6KgmIgtyL3fYGlaKX4zVLVDk,2861
-radnn-0.0.8.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-radnn-0.0.8.dist-info/top_level.txt,sha256=FKlLIm6gRAeZlRzs-HCBJAB1q9ELJ7MgaL-qqFuPo6M,6
-radnn-0.0.8.dist-info/RECORD,,
+radnn-0.0.9.dist-info/licenses/LICENSE.txt,sha256=vYtt_GDvm_yW65X9YMBOOu8Vqc9SAvqH94TbfBc2ckU,1106
+radnn-0.0.9.dist-info/METADATA,sha256=pRzxFjDAlZv-Aseunl5zCmiSbiL48i7YGVYAAHPJ7uE,1572
+radnn-0.0.9.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+radnn-0.0.9.dist-info/top_level.txt,sha256=FKlLIm6gRAeZlRzs-HCBJAB1q9ELJ7MgaL-qqFuPo6M,6
+radnn-0.0.9.dist-info/RECORD,,

{radnn-0.0.8.dist-info → radnn-0.0.9.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any