1

pages/3_Загрузка CSV.py

@@ -25,48 +25,51 @@ def save_dataframe_dialog_start(new_filename, dfToSave):
     if d_cols[0].button("Закрыть"):
         st_rerun()
 
-col1, col2 = st.columns(2)
-
-#uploaded_file = col1.file_uploader("“откройте CSV для загрузки”", ["csv","zip"]) #  или CSV.ZIP
-uploaded_file = col1.file_uploader("“откройте CSV для загрузки”", ["csv"])
-df = None
-if uploaded_file is not None:
-    col2.write(uploaded_file)
-    col2.write(type(uploaded_file))
-    delim = ";"
-    enc = "utf-8"
-    if uploaded_file.type == "text/csv":
-        if True:
-            bytes_uploaded = uploaded_file.read(4*1024)
-            uploaded_file.seek(0) # встать на начало
-            cpage = json.detect_encoding(bytes_uploaded) # import charset_normalizer # https://charset-normalizer.readthedocs.io/en/latest/user/getstarted.html#basic-usage
-            dialect = csv.Sniffer().sniff(bytes_uploaded.decode(cpage, errors="replace"))
-            uploaded_file.seek(0) # встать на начало
-            col2.write(f"{enc=} found {cpage=} \t.\t.\t.\t {delim=} found {dialect.delimiter=}")
-            delim = dialect.delimiter
-        try: df = pd.read_csv(uploaded_file, sep=delim, encoding=enc, header="infer")
-        except Exception as ex: col2.write(ex)
-    else:
-        if uploaded_file.type == "application/x-zip-compressed":
-            try: df = pd.read_csv(uploaded_file, sep=delim, encoding=enc, compression="zip")
+tab1,tab2 = st.tabs(["💾 Загрузка локального файла на сервер", "🧊 Просмотр загруженных файлов"])
+
+with tab1:
+    col1, col2 = st.columns(2)
+
+    #uploaded_file = col1.file_uploader("“откройте CSV для загрузки”", ["csv","zip"]) #  или CSV.ZIP
+    uploaded_file = col1.file_uploader("“откройте CSV для загрузки”", ["csv"])
+    df = None
+    if uploaded_file is not None:
+        col2.popover(type(uploaded_file).__name__).write(type(uploaded_file))
+        col2.write(uploaded_file)
+        delim = ";"
+        enc = "utf-8"
+        if uploaded_file.type == "text/csv":
+            if True:
+                bytes_uploaded = uploaded_file.read(4*1024)
+                uploaded_file.seek(0) # встать на начало
+                cpage = json.detect_encoding(bytes_uploaded) # import charset_normalizer # https://charset-normalizer.readthedocs.io/en/latest/user/getstarted.html#basic-usage
+                dialect = csv.Sniffer().sniff(bytes_uploaded.decode(cpage, errors="replace"))
+                uploaded_file.seek(0) # встать на начало
+                col2.write(f"{enc=} found {cpage=} \t.\t.\t.\t {delim=} found {dialect.delimiter=}")
+                delim = dialect.delimiter
+            try: df = pd.read_csv(uploaded_file, sep=delim, encoding=enc, header="infer")
             except Exception as ex: col2.write(ex)
         else:
-            col2.write(uploaded_file.type)
-
-if not df is None:
-    df.style.format(precision=3, thousands=" ", decimal=".")
-    col1.dataframe(df) #, column_config=)
-    colnames = "".join(df.columns)
-    if colnames.lower().startswith("xyz"):
-        colcounts = "_".join(map(str,sorted(set(df.notna().sum()), reverse=True)))
-        fileXYZ = f"{colnames}_{colcounts}.CSV"
-        if col1.button(f"можно сохранить на сервер файл '{fileXYZ}'"): # .to_excel(fileXlsName)
-            save_dataframe_dialog_start(fileXYZ, df)
-    col2.write(df.describe())
-    dfinfo = my_stm.pandas_info(df)
-    col2.write(dfinfo)
-
-    #col1.write(df.aggregate(["mean","median","prod","sum","std","var"]))
+            if uploaded_file.type == "application/x-zip-compressed":
+                try: df = pd.read_csv(uploaded_file, sep=delim, encoding=enc, compression="zip")
+                except Exception as ex: col2.write(ex)
+            else:
+                col2.write(uploaded_file.type)
+
+    if not df is None:
+        df.style.format(precision=3, thousands=" ", decimal=".")
+        col1.dataframe(df) #, column_config=)
+        colnames = "".join(df.columns)
+        if colnames.lower().startswith("xyz"):
+            colcounts = "_".join(map(str,sorted(set(df.notna().sum()), reverse=True)))
+            fileXYZ = f"{colnames}_{colcounts}.CSV"
+            if col1.button(f"можно сохранить на сервер файл '{fileXYZ}'"): # .to_excel(fileXlsName)
+                save_dataframe_dialog_start(fileXYZ, df)
+        col2.write(df.describe())
+        dfinfo = my_stm.pandas_info(df)
+        col2.write(dfinfo)
+
+        #col1.write(df.aggregate(["mean","median","prod","sum","std","var"]))
 
 
 

pages/6_TECT_7_ID.py

@@ -0,0 +1,71 @@
+import os, re, sys, time, math, shutil, urllib, string, random, pickle, zipfile, datetime
+import streamlit as st, pandas as pd, numpy as np
+import my_static_methods as my_stm
+
+st.html(my_stm.STYLE_CORRECTION)
+st.sidebar.markdown("🧊 проверка по пакетам XYZ")
+
+def ReRun():
+    st.rerun()
+
+def DescriptionMarkdown() -> str:
+    return """
+        ## Описание
+        # 1) Загрузка нового файла
+        Источником данных является файл CSV
+    """
+
+def save_dataframe_nodialog_idxyz(new_filename, dfToSave):
+    commit_info = my_stm.save_dataframe_to_hf(REPO, dfToSave, new_filename, "ID_XYZ")
+    st.toast(commit_info, icon='😍')
+    ReRun()
+
+
+REPO = my_stm.HfRepo("f64k/gaziev", "dataset", st.secrets["HF_WRITE"])
+lstRepoFiles = my_stm.list_files_hf(REPO)
+lstTestFilesIdXyz = [f.upper().replace("ID_XYZ/","") for f in lstRepoFiles if f.upper().startswith("ID_XYZ/")]
+
+col1, col2 = st.columns([1,1])
+with col1.container():
+    cont_cols = st.columns([1,2])
+    cont_cols[0].popover("?").markdown(DescriptionMarkdown())
+    with cont_cols[1].popover("добавить новый файл"):
+        uploaded_file = st.file_uploader("“откройте CSV для загрузки”", ["csv"])
+        if uploaded_file is not None:
+            dfLoaded = None
+            delim = ";"
+            enc = "utf-8"
+            if uploaded_file.type == "text/csv":
+                try: dfLoaded = pd.read_csv(uploaded_file, sep=delim, encoding=enc)
+                except Exception as ex: st.write(ex)
+            else:
+                if uploaded_file.type == "application/x-zip-compressed":
+                    try: dfLoaded = pd.read_csv(uploaded_file, sep=delim, encoding=enc, compression="zip")
+                    except Exception as ex: st.write(ex)
+                else:
+                    st.error(uploaded_file.type)
+            # dataframe ready. try to upload to HF
+            if not dfLoaded is None:
+                dfToUpload = dfLoaded.query("ID!='ID'")
+                #col2.dataframe(df)
+                colnames = "".join(dfToUpload.columns)
+                if colnames.lower().startswith("idxyz"):
+                    dgID = dfToUpload.groupby("ID")
+                    dictGroupID = dict(list(dgID))
+                    lstGroupIDs = list(dictGroupID.keys())
+                    #col2.write(dictGroupID)
+                    lst_len = list(set(dgID.apply(len)))
+                    if len(lst_len) == 1:
+                        fileXYZ = f"{colnames}_{len(dictGroupID)}_{lst_len[0]}_{lstGroupIDs[0]}_{lstGroupIDs[-1]}.csv".upper()
+                        if fileXYZ in lstTestFilesIdXyz:
+                            if st.button(f"такой файл есть! перезаписать файл '{fileXYZ}'?"):
+                                save_dataframe_nodialog_idxyz(fileXYZ, dfToUpload)
+                        else:
+                            save_dataframe_nodialog_idxyz(fileXYZ, dfToUpload)
+                    else:
+                        st.error(f"Разные размеры пакетов для разных ID, варианты : {lst_len}")
+    # список уже имеющихся файлов
+    st.write(lstTestFilesIdXyz)
+#with col1.container():
+
+

pages/9_Таблица_результатов.py

@@ -3,10 +3,12 @@ import my_static_methods as my_stm
 st.markdown(my_stm.STYLE_CORRECTION, unsafe_allow_html=True)
 
 st.sidebar.markdown("###  просто таблица случайных чисел - пока заглушка ❄️")
-pop = st.sidebar.popover("Open popover")
+
+pop = st.popover("Open popover")
 pop.dataframe(my_stm.df_random_dataframe())
 
-expand = st.expander("My label", icon=":material/info:")
+expand = st.sidebar.expander("My label", icon=":material/info:")
 expand.write("Inside the expander.")
+
 pop = st.popover("Button label")
 pop.checkbox("Show all")