fix(models): for use cases sey different col names

frischHWC · frischHWC · Dec 3, 2024 · May 27, 2024 · May 31, 2024 · May 31, 2024
commit e5a4a546691ae100b4c1ccb35b6877ce395eb43a
diff --git a/src/main/resources/models/use-cases/stores/customer.json b/src/main/resources/models/use-cases/stores/customer.json
@@ -1,7 +1,7 @@
 {
   "model_name" : "customer-stores",
   "Fields" : [ {
-    "name" : "name",
+    "name" : "customer_name",
     "type" : "NAME",
     "filters" : [ "USA" ]
   }, {
@@ -16,15 +16,15 @@
   }, {
     "name" : "customer_country",
     "type" : "LINK",
-    "link" : "$city.country"
+    "link" : "$customer_city.country"
   }, {
     "name" : "city_lat",
     "type" : "LINK",
-    "link" : "$city.lat"
+    "link" : "$customer_city.lat"
   }, {
     "name" : "city_long",
     "type" : "LINK",
-    "link" : "$city.long"
+    "link" : "$customer_city.long"
   }, {
     "name" : "customer_email",
     "type" : "EMAIL",
@@ -170,7 +170,7 @@
   }, {
     "name" : "customer_gender",
     "type" : "LINK",
-    "link" : "$name.sex"
+    "link" : "$customer_name.sex"
   } ],
   "Table_Names" : {
     "HIVE_HDFS_FILE_PATH" : "/tmp/datagen-customer/",

diff --git a/src/main/resources/models/use-cases/stores/employee.json b/src/main/resources/models/use-cases/stores/employee.json
@@ -50,7 +50,7 @@
   }, {
     "name" : "annual_salary",
     "type" : "INTEGER",
-    "formula" : "var factor=1\nvar base=41234\nvar additional=0\n\nif ( \"${gender}\" == \"female\") {\nfactor-=0.1\n}\n\nswitch(\"${seniority_level}\") {\ncase \"SKILLED\": \nfactor+=0.5\nbreak;\ncase \"SENIOR\": \nfactor+=1\nbreak;\ndefault:\nfactor+=0.1\n}\n\nif ( \"${specialty}\" == \"Kids\") {\nadditional+=1000\n}\n\nif ( \"${specialty}\" == \"Women's dress\" && \"${gender}\" == \"FEMALE\") {\nadditional+=2000\n}\n\nif ( \"${specialty}\" == \"Women's top\" && \"${gender}\" == \"MALE\") {\nadditional+=800\n}\n\nif ( \"${specialty}\" == \"Men's shirts\" && \"${gender}\" == \"MALE\") {\nadditional-=500\n}\n\nif ( \"${specialty}\" == \"Men's pants\" && \"${gender}\" == \"FEMALE\") {\nadditional+=1500\n}\n\nif ( \"${specialty}\" == \"Jackets & Coats\") {\nfactor+=0.3\n}\n\n\nMath.round((base + additional)*factor)\n\n"
+    "formula" : "var factor=1\nvar base=41234\nvar additional=0\n\nif ( \"${employee_gender}\" == \"female\") {\nfactor-=0.1\n}\n\nswitch(\"${seniority_level}\") {\ncase \"SKILLED\": \nfactor+=0.5\nbreak;\ncase \"SENIOR\": \nfactor+=1\nbreak;\ndefault:\nfactor+=0.1\n}\n\nif ( \"${specialty}\" == \"Kids\") {\nadditional+=1000\n}\n\nif ( \"${specialty}\" == \"Women's dress\" && \"${employee_gender}\" == \"FEMALE\") {\nadditional+=2000\n}\n\nif ( \"${specialty}\" == \"Women's top\" && \"${employee_gender}\" == \"MALE\") {\nadditional+=800\n}\n\nif ( \"${specialty}\" == \"Men's shirts\" && \"${employee_gender}\" == \"MALE\") {\nadditional-=500\n}\n\nif ( \"${specialty}\" == \"Men's pants\" && \"${employee_gender}\" == \"FEMALE\") {\nadditional+=1500\n}\n\nif ( \"${specialty}\" == \"Jackets & Coats\") {\nfactor+=0.3\n}\n\n\nMath.round((base + additional)*factor)\n\n"
   },{
     "name" : "hiring_date",
     "type" : "BIRTHDATE",

diff --git a/src/main/resources/models/use-cases/stores/stores-nodesc.json b/src/main/resources/models/use-cases/stores/stores-nodesc.json
@@ -5,13 +5,13 @@
     "type" : "INCREMENT_INTEGER",
     "min" : 0
   }, {
-    "name" : "city",
+    "name" : "city_of_store",
     "type" : "CITY",
     "filters" : [ "USA" ]
   }, {
-    "name" : "country",
+    "name" : "country_of_store",
     "type" : "LINK",
-    "link" : "$city.country"
+    "link" : "$city_of_store.country"
   }, {
     "name" : "opening_date",
     "type" : "BIRTHDATE",
@@ -126,7 +126,7 @@
       "length" : 20,
       "formula" : "if(${square_meters} < 100) {\n\"small\"\n} else if(${square_meters} < 250) {\n\"medium\"\n} else if(${square_meters} < 450) {\n\"large\" \n} else {\n\"extra-large\"\n}"
     }, {
-      "name" : "employees",
+      "name" : "number_of_employees",
       "type" : "INTEGER",
       "formula" : "var extra_factor = 0\nif(${open-sunday} == true){\nextra_factor+=1\n}\nif(${extra-night-hours-week}==1) {\nextra_factor+=0.7\n} else if(${extra-night-hours-week}==2) {\nextra_factor+=1\n}\nif(${extra-night-hours-week-end}==1) {\nextra_factor+=0.6\n} else if(${extra-night-hours-week-end}>=2) {\nextra_factor+=1.1\n}\n1+Math.round((${square_meters}/17.5)+extra_factor)"
     }],

diff --git a/src/main/resources/models/use-cases/stores/stores.json b/src/main/resources/models/use-cases/stores/stores.json
@@ -11,7 +11,7 @@
   }, {
     "name" : "country_of_store",
     "type" : "LINK",
-    "link" : "$city.country"
+    "link" : "$city_of_store.country"
   }, {
     "name" : "opening_date",
     "type" : "BIRTHDATE",
@@ -132,7 +132,7 @@
     }, {
       "name" : "description",
       "type" : "OLLAMA",
-      "request" : "write a short description about your ${size} clothing store located in ${city}, ${country}",
+      "request" : "write a short description about your ${size} clothing store located in ${city_of_store}, ${country_of_store}",
       "context" : "You are owner of a clothing store. Write short description to present it to customers. Description is less than 100 characters. Provide only short description. Provide only description, no metadata, no annotations.",
       "file" : "https://huggingface.co/TheBloke/CapybaraHermes-2.5-Mistral-7B-GGUF/resolve/main/capybarahermes-2.5-mistral-7b.Q2_K.gguf",
       "model_type" : "llama3"