Merge branch 'develop'

pages/upload.py

@@ -6,6 +6,7 @@ import streamlit as st
 from mdata.file_formats.csv import read_machine_data
 from mdata.file_formats.csv.shared import HeaderFormatLiterals
 from mdata.file_formats.hdf import read_machine_data_h5
+from streamlit.runtime.uploaded_file_manager import UploadedFile
 
 from logic.switch_page import switch_page
 
@@ -41,13 +42,13 @@ def import_hdf(h5f):
 
 
 # @st.experimental_memo
-def import_csv(hf, df):
+def import_csv(hf: UploadedFile, df: UploadedFile):
     header_format: HeaderFormatLiterals = 'csv'
     if 'csv' in hf.type:
         header_format = 'csv'
     elif 'json' in hf.type:
         header_format = 'json'
-    elif 'yaml' in hf.type:
+    elif 'octet-stream' in hf.type and ('yaml' in hf.name or 'yml' in hf.name):
         header_format = 'yaml'
     assert header_format is not None
     return read_machine_data(hf.getvalue(), df.getvalue(), validity_checking=True, header_format=header_format)

pyproject.toml

@@ -13,13 +13,13 @@ python = "^3.11"
 streamlit = "^1.25"
 cvxopt = "^1.3"
 # mdata = "^0.1.2"
-mdata = { git = "https://git-ce.rwth-aachen.de/machine-data/mdata.git", branch = "master" }
+mdata = { git = "https://git-ce.rwth-aachen.de/machine-data/mdata.git", branch = "release" }
 #mdata = [
 #    { platform = "linux", git = "https://git-ce.rwth-aachen.de/leah.tgu/mdata.git", branch = "master" },
 #    { platform = "windows", path = "C:/Users/Leah/PycharmProjects/mdata", develop = true }
 #]
 seaborn = "^0.12.2"
-plotly = "^5.15"
+plotly = "^5.16"
 tsdownsample = "^0.1.2"
 
 [build-system]