repo update from private

marimo/bomb_calorimetry.py

@@ -1,6 +1,6 @@
 import marimo
 
-__generated_with = "0.11.0"
+__generated_with = "0.11.2"
 app = marimo.App(width="medium")
 
 
@@ -94,11 +94,11 @@ def _(cek, lab, mo, reset_button, run_button, sample_selector):
         mo.stop(sample_selector.value is None, mo.md(f"### No sample selected !!"))
 
         lab.set_parameters(sample=sample_selector.value)
-        _ = lab.create_data()
-        fname = lab.write_data_to_file()
+        data = lab.create_data()
+        print(data)
+        file_content = lab.write_data_to_string()
 
-        with open(fname, "r") as f:
-            file_content = f.read()
+        fname = lab.filename_gen.random
         message = f"### Running Experiment\n"
         for k,v in lab.metadata.items():
             message += f"####{k} = {v}\n"
@@ -111,15 +111,13 @@ def _(cek, lab, mo, reset_button, run_button, sample_selector):
         )
 
         plot = cek.plotting()
-        data,_,_ = lab.read_data_file(fname)
-        plot.quick_plot(data,output=fname.replace(".csv",".png"))
-        image = mo.image(fname.replace(".csv",".png"),width=500)
+        print(data)
+        image = plot.quick_plot(scatter=data,output="marimo")
 
-    mo.vstack([mo.md(message),download_button,image])
+    mo.hstack([mo.vstack([mo.md(message),download_button]),image])
     return (
         data,
         download_button,
-        f,
         file_content,
         fname,
         image,

marimo/crystal_violet.py

@@ -1,6 +1,6 @@
 import marimo
 
-__generated_with = "0.11.0"
+__generated_with = "0.11.2"
 app = marimo.App(width="medium")
 
 
@@ -46,21 +46,22 @@ def _(mo):
 @app.cell
 def _(lab, mo):
     def set_ID(value):
-    try:
-        student_number = int(value.strip())
-        if student_number <= 0:
+        try:
+            student_number = int(value.strip())
+            if student_number <= 0:
+                print(mo.md(f"### Invalid Student ID: {student_ID.value}"))
+            else:
+                print(f"Valid Student ID: {student_number}")
+                lab.set_student_ID(int(value))
+        except ValueError:
+            mo.stop(not student_ID.value.isdigit(), mo.md(f"### Invalid Student ID: {student_ID.value}"))
             print(mo.md(f"### Invalid Student ID: {student_ID.value}"))
-        else:
-            print(f"Valid Student ID: {student_number}")
-            lab.set_student_ID(int(value))
-    except ValueError:
-        mo.stop(not student_ID.value.isdigit(), mo.md(f"### Invalid Student ID: {student_ID.value}"))
-        print(mo.md(f"### Invalid Student ID: {student_ID.value}"))
 
     student_ID = mo.ui.text(value="", label="Student ID:",on_change=set_ID)
 
     def set_fname(value):
         lab._set_filename(value)
+        
     exp_ID = mo.ui.text(value="Automatic", label="Output file:", on_change=set_fname)
 
     cv_volume = mo.ui.number(start=0,stop=100,step=1,value=None,label="Volume of CV solution (mL)")
@@ -104,7 +105,6 @@ def _(
     oh_volume,
     reset_button,
     run_button,
-    student_ID,
     temperature,
 ):
     if reset_button.value:
@@ -123,11 +123,10 @@ def _(
             volumes={'cv': cv_vol, 'oh': oh_vol, 'h2o': h2o_vol},
             temperature=temperature.value+273.15
         )
-        _ = lab.create_data()
-        fname = lab.write_data_to_file()
-        
-        with open(fname, "r") as f:
-            file_content = f.read()
+        data = lab.create_data()
+        file_content = lab.write_data_to_string()
+
+        fname = lab.filename_gen.random
         message = f"### Running Experiment\n"
         for k,v in lab.metadata.items():
             message += f"####{k} = {v}\n"
@@ -140,16 +139,13 @@ def _(
         )
 
         plot = cek.plotting()
-        data,_,_ = lab.read_data_file(fname)
-        plot.quick_plot(data,output=fname.replace(".csv",".png"))
-        image = mo.image(fname.replace(".csv",".png"),width=500)
-        
-    mo.vstack([mo.md(message),download_button,image])
+        image = plot.quick_plot(scatter=data,output="marimo")
+
+    mo.hstack([mo.vstack([mo.md(message),download_button]),image])
     return (
         cv_vol,
         data,
         download_button,
-        f,
         file_content,
         fname,
         h2o_vol,

marimo/statistics_lab.py

@@ -100,11 +100,10 @@ def _(cek, lab, mo, reset_button, run_button, sample_selector):
             number_of_values = 12,
             sample=sample_selector.value
         )
-        _ = lab.create_data()
-        fname = lab.write_data_to_file()
+        data = lab.create_data()
+        file_content = lab.write_data_to_string()
 
-        with open(fname, "r") as f:
-            file_content = f.read()
+        fname = lab.filename_gen.random
         message = f"### Running Experiment\n"
         for k,v in lab.metadata.items():
             message += f"####{k} = {v}\n"
@@ -117,11 +116,9 @@ def _(cek, lab, mo, reset_button, run_button, sample_selector):
         )
 
         plot = cek.plotting()
-        data,_,_ = lab.read_data_file(fname)
-        plot.quick_plot(data,output=fname.replace(".csv",".png"))
-        image = mo.image(fname.replace(".csv",".png"),width=500)
+        image = plot.quick_plot(scatter=data,output="marimo")
 
-    mo.vstack([mo.md(message),download_button,image])
+    mo.hstack([mo.vstack([mo.md(message),download_button]),image])
     return (
         data,
         download_button,

marimo/surface_adsorption.py

@@ -97,28 +97,25 @@ def _(cek, lab, mo, reset_button, run_button, student_ID, temperature):
         lab.set_parameters(
             temperature = temperature.value+273.15
         )
-        _ = lab.create_data()
-        fname = lab.write_data_to_file()
-        
-        with open(fname, "r") as f:
-            file_content = f.read()
+        data = lab.create_data()
+        file_content = lab.write_data_to_string()
+    
+        fname = lab.filename_gen.random
         message = f"### Running Experiment\n"
         for k,v in lab.metadata.items():
             message += f"####{k} = {v}\n"
         message += f"#### File created = {fname}\n"
-
+    
         download_button = mo.download(
             file_content,
             filename=fname,
             label=f"Download {fname}",
         )
-
+    
         plot = cek.plotting()
-        data,_,_ = lab.read_data_file(fname)
-        plot.quick_plot(data,output=fname.replace(".csv",".png"))
-        image = mo.image(fname.replace(".csv",".png"),width=500)
-        
-    mo.vstack([mo.md(message),download_button,image])
+        image = plot.quick_plot(scatter=data,output="marimo")
+    
+    mo.hstack([mo.vstack([mo.md(message),download_button]),image])
     return (
         data,
         download_button,

src/pycek_public/bomb_calorimetry.py

@@ -113,5 +113,5 @@ class bomb_calorimetry(cek.cek_labs):
         y = self._round_values(y)
         self.data = np.column_stack((x,y))
 
-        return
+        return self.data
 

src/pycek_public/cek_labs.py

@@ -160,37 +160,40 @@ class cek_labs(ABC):
             filename = self.output_file
         self.add_metadata(output_file=filename)
 
+        string = self.write_data_to_string(**kwargs)
         with open(filename, 'w') as f:
-            # Write the column names
-            cols = None
-            if "columns" in kwargs:
-                cols = kwargs["columns"]
-            elif "columns" in self.metadata:
-                cols = self.metadata["columns" ]
-            if cols is not None:
-                f.write(",".join(cols) + "\n")
-
-            # Convert NumPy array to list if needed
-            # if isinstance(self.data, np.ndarray):
-            #     self.data = self.data.tolist()
-
-            # Write data
-            for row in self.data:
-                # Handle multiple columns
-                if isinstance(row, (list, tuple, np.ndarray)):
-                    line = ",".join(map(str, row))
-                # Handle single-column case
-                else:
-                    line = str(row)
-                f.write(line + "\n")
-
-        # Write the kwargs as metadata
-        self.write_metadata(filename)
+            f.write(string)
 
         self.list_of_data_files.append( filename )
 
         return filename
 
+    def write_data_to_string(self,**kwargs):
+        if "columns" in kwargs:
+            string = ",".join(kwargs["columns"]) + "\n"
+        elif "columns" in self.metadata:
+            string = ",".join(self.metadata["columns"]) + "\n"
+        else:
+            string = ""
+
+        # Write data
+        for row in self.data:
+            # Handle multiple columns
+            if isinstance(row, (list, tuple, np.ndarray)):
+                string += ",".join(map(str, row))+"\n"
+            # Handle single-column case
+            else:
+                string += str(row)+"\n"
+
+        # Write metadata
+        for key, value in self.metadata.items():
+            s = f"{key}"
+            s = s.replace("_"," ")
+            s = s[0].upper() + s[1:] + f" = {value}"
+            string += f"# {s}\n"
+
+        return string
+
     def read_data_file(self,filename=None):
         if filename is None:
             raise ValueError("Filename is missing")

src/pycek_public/crystal_violet.py

@@ -72,5 +72,5 @@ class crystal_violet(cek.cek_labs):
                 background = self.background,
                 )
         
-        return 
+        return self.data
     

src/pycek_public/plotting.py

@@ -56,6 +56,8 @@ class plotting():
         # Show the plot
         if output is None:
             plt.show()
+        elif output == "marimo":
+            return plt.gcf()
         else:
             plt.savefig(output)
         plt.close()