new update

analysis_func.py

@@ -1,8 +0,0 @@
-import pandas as pd
-import numpy as np 
-
-def read_csv(path):
-    dataFrame = pd.read_csv('temp.csv')
-    return dataFrame
-
-

app.py

@@ -1,59 +1,12 @@
 import streamlit as st
-from screen.screen_add_note import screen_add_main
 from screen.screen_scan import screen_scan_main
-from screen.screen_note import screen_note_main
-from streamlit_option_menu import option_menu
-
-def local_css(file_name):
-    with open(file_name) as f:
-        st.markdown(f"<style>{f.read()}</style>", unsafe_allow_html=True)
-
-local_css("style.css")
-
-
-
-def streamlit_menu(example=3):
-    
-    if example == 3:
-        # 2. horizontal menu with custom style
-        selected = option_menu(
-            menu_title=None,  # required
-            options=["Optik Okuma", "Not Girisi", "Not Duzenleme","Analiz"],  # required
-            icons=["house", "book", "envelope","envelope"], 
-            default_index=0,  # optional
-            orientation="horizontal",
-            styles={
-                "container": {"padding": "0!important", "background-color": "#b2d8d8"},
-                "icon": {"color": "orange", "font-size": "0px"},
-                "nav-link": {
-                    "font-size": "15px",
-                    "text-align": "left",
-                    "margin": "0px",
-                    "--hover-color": "#eee",
-                },
-                "nav-link-selected": {"background-color": "#008080"},
-            },
-        )
-        return selected
-
-
 
 
 def main():
-    
-    
-    selected = streamlit_menu(example=3)
-    
-    if selected == "Optik Okuma":
-        screen_scan_main()
-    if selected == "Not Girisi":
-        screen_add_main()
-    if selected == "Not Duzenleme":
-        screen_note_main()
-    if selected == "Analiz":
-        screen_note_main()
+  
+    screen_scan_main()
+
    
-    
 if __name__ == "__main__":
     main()
     

data

@@ -1 +1 @@
-Subproject commit e29ebebe3fcb37c4ac9e61991f29a7924b5890e1
+Subproject commit 15af2cacd27fc180a93ccc0904359de7b1f16481

data_func.py

@@ -19,10 +19,9 @@ def pull_read():
     
     return repo, df
 
-def make_new_data(sinif_kodu,ogrenci_no,ders_kodu,notu,yanlislar):
-    yeni_satir = {"sinif_kodu": sinif_kodu, 
+def make_new_data(sinav_kodu,ogrenci_no,notu,yanlislar):
+    yeni_satir = {"sinav_kodu": sinav_kodu, 
               "ogrenci_no": ogrenci_no, 
-              "ders_kodu": ders_kodu,
               "notu": notu, 
              "yanlis_sorulari": yanlislar}
     new_data = pd.DataFrame([yeni_satir])
@@ -32,8 +31,8 @@ def update(new_data, ex_df):
     updated_df = pd.concat([ex_df, new_data])
     return updated_df
     
-def save_and_push(dataFrame,repo):
-    dataFrame.to_csv("data/untitled.csv",index=False)
+def save_and_push(dataFrame,repo,fileName):
+    dataFrame.to_csv(fileName,index=False)
     commit_url = repo.push_to_hub()
     return commit_url
 

screen/screen_about.py

@@ -1,5 +0,0 @@
-"""""
-Ornek Pdfler
-Nasıl KUllanılmalı gıbı seyler yaz
-
-"""

screen/screen_analysis.py

@@ -1,17 +0,0 @@
-import streamlit as st 
-import pandas as pd
-import data_func
-from data_func import DATASET_REPO_URL,DATA_FILENAME,DATA_FILE,HF_TOKEN
-
-
-
-def screen_analysis_main():
-    #repo, repo_df = data_func.pull_read()
-    #ogrenci_no = st.text_input("Öğrenci No")
-    #filtered_df = repo_df[(repo_df['sinif_no'] == 3) & (repo_df['not'] > 70)]
-    dataFrame = pd.read_csv('db/temp.csv')
-    
-
-
-if __name__ == "__main__":
-    screen_analysis_main()

screen/screen_note.py

@@ -1,15 +0,0 @@
-import streamlit as st
-import pandas as pd
-import data_func
-from data_func import DATASET_REPO_URL,DATA_FILENAME,DATA_FILE,HF_TOKEN
-
-
-def screen_note_main():
-    repo, repo_df = data_func.pull_read()
-
-    st.subheader("Girilen Veriler")
-    st.dataframe(repo_df,use_container_width=True)
-    #filtered_df = repo_df[(repo_df['sinif_no'] == 3) & (repo_df['not'] > 70)]
-        
-if __name__ == "__main__":
-    screen_note_main()

screen/screen_scan.py

@@ -6,7 +6,23 @@ from PIL import Image
 import optic1
 from functions import image_show
 import pandas as pd 
-from data_func import make_new_data,update
+from data_func import make_new_data,update,save_and_push
+import os
+from huggingface_hub import Repository
+
+
+
+def pull_read(DATASET_REPO_URL,HF_TOKEN,DATA_FILE):
+    
+    repo = Repository(
+        local_dir="data", clone_from=DATASET_REPO_URL, use_auth_token=HF_TOKEN
+        )
+    
+    with open(DATA_FILE) as csvfile:
+        df = pd.read_csv(csvfile) 
+        df = pd.DataFrame(df)
+    
+    return repo, df
 
 @st.cache
 def convert_df_to_csv(df):
@@ -15,18 +31,27 @@ def convert_df_to_csv(df):
 
 def screen_scan_main():
     st.title("Optik Okuma")
-    dataFrame = pd.read_csv('db/temp.csv')
-    sinif_kodu = int(st.text_input("Sınıf Kodu",value=10))
-    ders_kodu = int(st.text_input("Ders Kodu",value=10))
+    teacher_code = st.text_input("Ogretmen kodu:",key=12)
+    exam_code = st.text_input("Sınav Kodu:",key=13,value=10)
+
+    exam_code = int(exam_code)
+    teacher_code = str(teacher_code)
+    DATA_FILENAME = f"{teacher_code}.csv"
+    DATA_FILENAME = str(DATA_FILENAME)
+    
     image_file = st.file_uploader(
         "Upload image for testing", type=['jpeg', 'png', 'jpg', 'webp'])
-    st.dataframe(dataFrame)
+    
     
     if image_file != None:
-        image = Image.open(image_file)
-        image = np.array(image.convert('RGB'))
         
         if st.button("Process"):
+            repo, repo_df = pull_read(DATASET_REPO_URL = "https://huggingface.co/datasets/mertbozkurt/school_data",
+                                      DATA_FILE = os.path.join("data", DATA_FILENAME),
+                                      HF_TOKEN = "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")
+            repo.git_pull()
+            image = Image.open(image_file)
+            image = np.array(image.convert('RGB'))
             #(ans_txt,pathImage, save_images= True)
             grading, wrong_ans, student_idFix, resim_list =optic1.optic1(ans_txt1="cevapanahtari/cevapanahtari_ders1.txt",
                                                                              ans_txt2="cevapanahtari/cevapanahtari_ders2.txt",
@@ -38,18 +63,17 @@ def screen_scan_main():
             st.write("Notu:",grading[0])
             st.write("Yanlis Yaptigi sorular:",wrong_ans[0])
             st.write("Ogrenci Numarasi:",student_idFix)
-            new_data = make_new_data(sinif_kodu=sinif_kodu,ders_kodu=ders_kodu, ogrenci_no=int(student_idFix),
+            new_data = make_new_data(sinav_kodu=exam_code, ogrenci_no=int(student_idFix),
                                      notu=grading[0],yanlislar=wrong_ans[0])
             
             st.dataframe(new_data)
-            updated = update(new_data=new_data,ex_df=dataFrame)
+            updated = update(new_data=new_data,ex_df=repo_df)
             st.dataframe(updated,use_container_width=True)
-            updated.to_csv("db/temp.csv",index=False)
+            save_and_push(dataFrame=updated,repo=repo,fileName=f"data/{DATA_FILENAME}")
             
             st.download_button(label="Download data as CSV",data=convert_df_to_csv(updated),
                                file_name='large_df.csv',mime='text/csv',)        
             
-
 #python -m streamlit run app.py
 if __name__ == '__main__':
     screen_scan_main()	   

style.css

@@ -1,4 +0,0 @@
-section[data-testid="stSidebar"] div.stButton button {
-    background-color: rgb(95, 197, 228);
-    width: 200px;
-}