From 37a5cdb910495ae19c652464dce3fa055e1b839f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aneta=20Tla=C5=82ka?= Date: Tue, 17 Oct 2023 18:59:40 +0200 Subject: [PATCH 01/10] connect frontend to backend --- CenaMieszkaniaDesign.py | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/CenaMieszkaniaDesign.py b/CenaMieszkaniaDesign.py index 76d0761..33249c4 100644 --- a/CenaMieszkaniaDesign.py +++ b/CenaMieszkaniaDesign.py @@ -1,7 +1,32 @@ from tkinter import * +import joblib +import pandas as pd root = Tk() +def calculate_price(): + # Get the selected values and entry input + stan = selected_stan.get() + liczba_pokoi = selected_liczba_pokoi.get() + metraz = entry1.get() + rynek = selected_rynek.get() + + # Create a dictionary with the data + data = {'stan': [stan], 'l pokoi': [liczba_pokoi], 'metraż': [metraz], 'rynek': [rynek]} + + # Create a DataFrame from the dictionary + X = pd.DataFrame(data) + + # Load the model and make predictions + loaded_model = joblib.load('ridge_model.sav') + result = loaded_model.predict(X) + result = result / float(metraz) + + # Display the result + result_label.config(text=f"Predicted Price: {result[0]:.2f} PLN") + result_label.grid(row=6, column=1, padx=10, pady=5) + + root.geometry("500x500") root.title("Mieszkaneo") @@ -15,7 +40,7 @@ entry1.grid(row=1, column=0, padx=10, pady=5) label2 = Label(root, text="Rynek", font=('Arial', 18)) label2.grid(row=0, column=1, padx=10, pady=5) -rynek_options = ["Pierwotny", "Wtórny"] +rynek_options = ["pierwotny", "wtórny"] selected_rynek = StringVar() selected_rynek.set(rynek_options[0]) @@ -25,7 +50,7 @@ rynek_menu.grid(row=1, column=1, padx=10, pady=5) label3 = Label(root, text="Stan", font=('Arial', 18)) label3.grid(row=2, column=0, padx=10, pady=5) -stan_options = ["Do remontu", "Wykończone"] +stan_options = ["do zamieszkania", "do wykończenia","do remontu"] selected_stan = StringVar() selected_stan.set(stan_options[0]) @@ -43,8 +68,12 @@ liczba_pokoi_menu = OptionMenu(root, selected_liczba_pokoi, *liczba_pokoi_option liczba_pokoi_menu.config(font=('Arial', 18), bg='white', fg='black') # Kolory tła i tekstu liczba_pokoi_menu.grid(row=3, column=1, padx=10, pady=5) -button = Button(root, text="Oblicz cenę mieszkania", font=('Arial', 18)) +button = Button(root, text="Oblicz cenę mieszkania", font=('Arial', 18), command=calculate_price) button.config(bg='green', fg='white') # Kolory tła i tekstu button.grid(row=4, columnspan=2, padx=10, pady=10) +result_label = Label(root, text="", font=('Arial', 18)) +result_label.grid(row=5, columnspan=2, padx=10, pady=5) + + root.mainloop() From f6e54ca0ea895556b38058c48676a2ec7ac37c87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aneta=20Tla=C5=82ka?= Date: Tue, 24 Oct 2023 17:50:54 +0200 Subject: [PATCH 02/10] add Jenkinsfile --- Jenkinsfile | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..0ae63a2 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,21 @@ +pipeline { + agent any + + stages { + stage('Build') { + steps { + echo 'Building..' + } + } + stage('Test') { + steps { + echo 'Testing..' + } + } + stage('Deploy') { + steps { + echo 'Deploying....' + } + } + } +} \ No newline at end of file From 5abc468ec9ef4ba39e02596e81b80f64a29f626a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aneta=20Tla=C5=82ka?= Date: Tue, 24 Oct 2023 17:59:02 +0200 Subject: [PATCH 03/10] add docker agent --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0ae63a2..da8414b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,7 @@ pipeline { - agent any + agent { + docker { image 'node:18.18.2-alpine3.18' } + } stages { stage('Build') { From 26cfe9ad90ba8a7c8b4d11d966a2ab437a6e6e10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aneta=20Tla=C5=82ka?= Date: Tue, 24 Oct 2023 18:11:51 +0200 Subject: [PATCH 04/10] test file --- Jenkinsfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index da8414b..e6c6f62 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,6 +12,12 @@ pipeline { stage('Test') { steps { echo 'Testing..' + if (fileExists('CenaMieszkaniaDesign.py')) { + echo 'Yes' + } else { + echo 'No' + } + } } stage('Deploy') { From 2a1dc01143deb853e235331a7e00109ec9682c93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aneta=20Tla=C5=82ka?= Date: Tue, 24 Oct 2023 18:18:02 +0200 Subject: [PATCH 05/10] test file --- Jenkinsfile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e6c6f62..457f9b9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,15 +10,12 @@ pipeline { } } stage('Test') { + when { expression { return fileExists ('CenaMieszkaniaDesign.py') } } steps { - echo 'Testing..' - if (fileExists('CenaMieszkaniaDesign.py')) { - echo 'Yes' - } else { - echo 'No' - } - + echo "file exists" } + } + } stage('Deploy') { steps { From 6446b71528163b2d0a516df44ec9dd34b94f2bcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aneta=20Tla=C5=82ka?= Date: Tue, 24 Oct 2023 18:20:47 +0200 Subject: [PATCH 06/10] test --- Jenkinsfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 457f9b9..eff229c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,8 +14,6 @@ pipeline { steps { echo "file exists" } - } - } stage('Deploy') { steps { From 5e2b9180e62b1dfcf018ebcf748ee7e023b17bfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aneta=20Tla=C5=82ka?= Date: Tue, 24 Oct 2023 18:29:49 +0200 Subject: [PATCH 07/10] test script --- Jenkinsfile | 7 +++---- check_flat_price.py | 8 ++++++++ 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 check_flat_price.py diff --git a/Jenkinsfile b/Jenkinsfile index eff229c..12bb48d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ pipeline { agent { - docker { image 'node:18.18.2-alpine3.18' } + docker { image 'alpine/flake8:3.5.0' } } stages { @@ -10,10 +10,9 @@ pipeline { } } stage('Test') { - when { expression { return fileExists ('CenaMieszkaniaDesign.py') } } steps { - echo "file exists" - } + sh 'flake check_flat_price.py' + } } stage('Deploy') { steps { diff --git a/check_flat_price.py b/check_flat_price.py new file mode 100644 index 0000000..4d66148 --- /dev/null +++ b/check_flat_price.py @@ -0,0 +1,8 @@ +import pandas as pd +import numpy as np + +ceny = pd.read_csv('expected.tsv', sep='\t', header=None) + +for cena in ceny: + if cena < 0: + print("cena ujemna, sprawdz cene") \ No newline at end of file From 3661375381f6ebc7ea6ad797223e529e1a78e1d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aneta=20Tla=C5=82ka?= Date: Tue, 24 Oct 2023 18:37:50 +0200 Subject: [PATCH 08/10] test again --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 12bb48d..d6d78fb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ pipeline { agent { - docker { image 'alpine/flake8:3.5.0' } + docker { image 'alpine/flake8' } } stages { @@ -12,7 +12,7 @@ pipeline { stage('Test') { steps { sh 'flake check_flat_price.py' - } + } } stage('Deploy') { steps { From 3b02e3d493ea5e2f71b9363c541aabc1dc1b773a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aneta=20Tla=C5=82ka?= Date: Tue, 24 Oct 2023 18:43:53 +0200 Subject: [PATCH 09/10] test --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d6d78fb..4daa851 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { } stage('Test') { steps { - sh 'flake check_flat_price.py' + sh 'check_flat_price.py' } } stage('Deploy') { From b501baf758eceff4628d5e8c5e578a6df3f17b0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aneta=20Tla=C5=82ka?= Date: Tue, 24 Oct 2023 18:45:59 +0200 Subject: [PATCH 10/10] another test --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4daa851..3c2a521 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ pipeline { agent { - docker { image 'alpine/flake8' } + docker { image 'python:3.10.6-slim-bullseye' } } stages {