Update app.py

app.py

@@ -6,6 +6,18 @@ import random
 import matplotlib.pyplot as plt
 st.title('Каталог профессий IT и Продажи')
 
+"""Внедрение модели"""
+from predict import CatBoostPredictor
+# import sys
+
+predictor = CatBoostPredictor("catboostregressor_IT_and_sales.json", 
+                              "heuristic_regressor.json")
+"""Внедрение модели"""
+
+
+
+
+
 st.sidebar.title('Выбор параметров для подбора вакансий')
 
 with open('catalog.json', 'r') as json_file:
@@ -161,10 +173,28 @@ def table(sphere: str, list_with_skills: list, dohod, sphere_change, gotov_uchit
 
 df_fin = table(sphere, list_skills, dohod, sphere_change, gotov_uchitsia)
 
+
+"""Внедрение модели"""
+
+
 st.header('Рост Вашего дохода')
+labels = [age, age+3]
+dohod_2 = predictor.predict(dohod, age, job)
+ # 200_000.0, 25.0, "IT"
+values = [dohod, dohod_2]
+
+
+
+
+
+# labels = [age, age+1, age+2, age+3, age+4, age+5, age+6, age+7, age+8, age+9]
+# values = [dohod, dohod*1.05, dohod*1.1, dohod*1.11, dohod*1.12, dohod*1.13, dohod*1.14, dohod*1.14, dohod*1.14, dohod*1.14,]
+
+
+
+
+
 
-labels = [age, age+1, age+2, age+3, age+4, age+5, age+6, age+7, age+8, age+9]
-values = [dohod, dohod*1.05, dohod*1.1, dohod*1.11, dohod*1.12, dohod*1.13, dohod*1.14, dohod*1.14, dohod*1.14, dohod*1.14,]
 fig, ax = plt.subplots()
 
 # fig.set_size_inches(10, 5)