refactoring

examples/components/create_endpoint.py

@@ -1,13 +1,14 @@
 from typing import Dict
 
 import numpy as np
-from kartezio.components.core import (
+
+from kartezio.core.components import (
     Components,
+    Endpoint,
     dump_component,
     load_component,
     register,
 )
-from kartezio.components.endpoint import Endpoint
 from kartezio.types import TypeArray
 
 
@@ -73,7 +74,9 @@ def main():
     print(f"Output from my_endpoint: {output}")
 
     # Instantiate the endpoint from the component registry and apply it
-    my_endpoint_2 = Components.instantiate("Endpoint", "my_endpoint", n_classes=3)
+    my_endpoint_2 = Components.instantiate(
+        "Endpoint", "my_endpoint", n_classes=3
+    )
     output_2 = my_endpoint_2.call(inputs)  # Expected Output: 0
     print(f"Output from my_endpoint_2: {output_2}")
 

examples/components/create_primitive.py

@@ -1,8 +1,8 @@
 from typing import List
 
 import numpy as np
-from kartezio.components.core import Components, register
-from kartezio.components.library import Primitive
+
+from kartezio.core.components import Components, Primitive, register
 from kartezio.types import TypeArray
 
 

examples/training/advanced_trainer.py

@@ -1,13 +1,13 @@
 from kartezio.callback import CallbackVerbose
-from kartezio.endpoint import EndpointThreshold
+from kartezio.core.endpoints import EndpointThreshold
+from kartezio.core.fitness import FitnessIOU
 from kartezio.evolution.base import KartezioTrainer
-from kartezio.fitness import FitnessIOU
-from kartezio.libraries.array import create_array_lib
-from kartezio.libraries.scalar import library_scalar
 from kartezio.mutation.behavioral import AccumulateBehavior
 from kartezio.mutation.decay import LinearDecay
 from kartezio.mutation.edges import MutationEdgesNormal
 from kartezio.mutation.effect import MutationNormal
+from kartezio.primitives.array import create_array_lib
+from kartezio.primitives.scalar import library_scalar
 from kartezio.utils.dataset import one_cell_dataset
 
 
@@ -51,7 +51,9 @@ def main():
     # model.summary()  # Display the model summary
 
     # Load training data
-    train_x, train_y = one_cell_dataset()  # Use a simple one-cell dataset for training
+    train_x, train_y = (
+        one_cell_dataset()
+    )  # Use a simple one-cell dataset for training
 
     # trainer = KartezioTrainer(model)
 

examples/training/basic_trainer.py

@@ -1,7 +1,7 @@
-from kartezio.endpoint import EndpointThreshold
+from kartezio.core.endpoints import EndpointThreshold
+from kartezio.core.fitness import FitnessIOU
 from kartezio.evolution.base import KartezioTrainer
-from kartezio.fitness import FitnessIOU
-from kartezio.libraries.array import create_array_lib
+from kartezio.primitives.array import create_array_lib
 from kartezio.utils.dataset import one_cell_dataset
 
 
@@ -30,7 +30,9 @@ def main():
     model.set_mutation_rates(node_rate=0.05, out_rate=0.1)
 
     # Load training data
-    train_x, train_y = one_cell_dataset()  # Use a simple one-cell dataset for training
+    train_x, train_y = (
+        one_cell_dataset()
+    )  # Use a simple one-cell dataset for training
 
     # Train the model
     elite, history = model.fit(100, train_x, train_y)

src/kartezio/callback.py

@@ -6,7 +6,8 @@
 
 import matplotlib.pyplot as plt
 import numpy as np
-from kartezio.components.genotype import Genotype
+
+from kartezio.core.components import Genotype
 from kartezio.enums import JSON_ELITE
 from kartezio.evolution.decoder import Decoder
 from kartezio.helpers import Observer
@@ -32,7 +33,9 @@ def eventid():
 
 
 class Event:
-    def __init__(self, iteration: int, name: str, content: Dict, force: bool = False):
+    def __init__(
+        self, iteration: int, name: str, content: Dict, force: bool = False
+    ):
         self.iteration = iteration
         self.name = name
         self.content = content
@@ -106,7 +109,6 @@ def on_evolution_end(self, n, e_content):
         print(verbose)
 
 
-
 class CallbackSaveScores(Callback):
     def __init__(self, filename, dataset, preprocessing, fitness):
         super().__init__()
@@ -141,7 +143,9 @@ def on_new_parent(self, iteration, event_content):
 
     def on_evolution_end(self, iteration, event_content):
         self._add_new_line(iteration, event_content)
-        print(f"{self.filename} saved. {len(self.data)} lines, last = {self.data[-1]}")
+        print(
+            f"{self.filename} saved. {len(self.data)} lines, last = {self.data[-1]}"
+        )
         data = np.array(self.data)
         plt.figure()
         plt.plot(data[:, 0], data[:, 1])
@@ -155,7 +159,9 @@ def __init__(self, filename, dataset, preprocessing, fitness):
         self.filename = filename
         self.dataset = dataset.__to_dict__()
         self.decoder = None
-        self.preprocessing = preprocessing.__to_dict__() if preprocessing else None
+        self.preprocessing = (
+            preprocessing.__to_dict__() if preprocessing else None
+        )
         self.fitness = fitness.__to_dict__()
 
     def set_decoder(self, decoder: Decoder):
@@ -167,7 +173,9 @@ def on_new_parent(self, iteration, event_content):
             "iteration": iteration,
             "dataset": self.dataset,
             "elite": {
-                "chromosomes": {k: v.tolist() for k, v in elite._chromosomes.items()}
+                "chromosomes": {
+                    k: v.tolist() for k, v in elite._chromosomes.items()
+                }
             },
             "preprocessing": self.preprocessing,
             "decoder": self.decoder,

src/kartezio/cli/insight.py

@@ -2,10 +2,11 @@
 
 import cv2
 import numpy as np
+
+from kartezio.core.fitness import FitnessAP, FitnessIOU
 from kartezio.core.registry import registry
 from kartezio.easy import load_model, read_dataset
 from kartezio.export import KartezioInsight
-from kartezio.fitness import FitnessAP, FitnessIOU
 from kartezio.inference import KartezioModel
 
 

src/kartezio/cli/movie.py

@@ -3,16 +3,17 @@
 
 import matplotlib.pyplot as plt
 import numpy as np
+from matplotlib import gridspec
+from numena.io.drive import Directory
+from numena.io.image import imread_color
+from numena.io.json import json_read
+
 from kartezio.core.components import BaseGenotype
+from kartezio.core.fitness import FitnessAP
 from kartezio.data import read_dataset
-from kartezio.fitness import FitnessAP
 from kartezio.inference import KartezioModel
 from kartezio.preprocessing import SelectChannels
 from kartezio.utils.viewer import KartezioViewer
-from matplotlib import gridspec
-from numena.io.drive import Directory
-from numena.io.image import imread_color
-from numena.io.json import json_read
 
 CHANNELS = [1, 2]
 preprocessing = SelectChannels(CHANNELS)
@@ -36,7 +37,9 @@ def main():
     args = parser.parse_args()
 
     history_directory = Directory(args.history)
-    model = KartezioModel(f"{history_directory._path}/elite.json", fitness=FitnessAP())
+    model = KartezioModel(
+        f"{history_directory._path}/elite.json", fitness=FitnessAP()
+    )
     viewer = KartezioViewer(
         model._model.decoder.infos,
         model._model.decoder.library,

src/kartezio/cli/movie_graph.py

@@ -3,14 +3,15 @@
 
 import matplotlib.pyplot as plt
 import numpy as np
+from numena.io.drive import Directory
+from numena.io.image import imread_color
+from numena.io.json import json_read
+
 from kartezio.core.components import BaseGenotype
+from kartezio.core.fitness import FitnessAP
 from kartezio.easy import read_dataset
-from kartezio.fitness import FitnessAP
 from kartezio.inference import KartezioModel
 from kartezio.utils.viewer import KartezioViewer
-from numena.io.drive import Directory
-from numena.io.image import imread_color
-from numena.io.json import json_read
 
 
 def reformat_x(x):
@@ -51,7 +52,9 @@ def main():
     args = parser.parse_args()
 
     history_directory = Directory(args.history)
-    model = KartezioModel(f"{history_directory._path}/elite.json", fitness=FitnessAP())
+    model = KartezioModel(
+        f"{history_directory._path}/elite.json", fitness=FitnessAP()
+    )
     viewer = KartezioViewer(
         model._model.decoder.infos,
         model._model.decoder.library,
@@ -61,7 +64,9 @@ def main():
     cols_std = ["Parent", "Child", "Child"]
     cols_first = ["Child", "Child", "Child"]
 
-    idx_to_frame = list(range(1, 201)) + list(range(575, 626)) + list(range(1575, 1626))
+    idx_to_frame = (
+        list(range(1, 201)) + list(range(575, 626)) + list(range(1575, 1626))
+    )
     frame_name_count = 1
     for i in idx_to_frame:
         frame_name = f"frame_{frame_name_count:04}.png"
@@ -76,7 +81,9 @@ def main():
             )
             genome = BaseGenotype(sequence=sequence)
             model._model.genome = genome
-            p, f, t = model.eval(dataset, subset="train", reformat_x=reformat_x)
+            p, f, t = model.eval(
+                dataset, subset="train", reformat_x=reformat_x
+            )
             fitness.append(1.0 - f)
             model_graph = viewer.get_graph(
                 model._model.genome,