ApiLogicServer 14.3.25__py3-none-any.whl → 14.5.0__py3-none-any.whl

api_logic_server_cli/create_from_model/ont_build.py

@@ -80,7 +80,7 @@ class OntBuilder(object):
         self.currency_symbol_position="left" # "right"
         self.thousand_separator="," # "."
         self.decimal_separator="." # ","
-        self.date_format="LL" #not sure what this means
+        self.date_format="YYYY-DD-MM" #not sure what this means
         self.edit_on_mode = "dblclick" # edit or click
         self.include_translation = False
         self.row_height = "medium"
@@ -90,7 +90,7 @@ class OntBuilder(object):
         self.keycloak_realm = "kcals"
         self.keycloak_client_id = "alsclient"
         self.exclude_listpicker = False
-        self.apiEndpoint =  f"http://{project.host}:{project.port}/ontimizeweb/services/rest"
+        self.apiEndpoint =  f"http://{project.host}:{project.port}/api"
         self.title_translation = []
         self.languages = ["en", "es"] # "fr", "it", "de" etc - used to create i18n json files
         self.locale = "en"
@@ -156,14 +156,15 @@ class OntBuilder(object):
             with contextlib.suppress(Exception):
                 return self.template_env.get_template(template_name)
         use_local=True 
-        if use_local:
-            with contextlib.suppress(Exception):
-                return self.local_env.get_template(template_name)
         try:
+            if use_local:
+                with contextlib.suppress(Exception):
+                    return self.local_env.get_template(template_name)
+            
             return self.env.get_template(template_name)
         except Exception as e:
             log.error(f"Error loading template {template_name} - {e}")
-            return None 
+        return None 
 
     
     def build_application(self, show_messages: bool = True):
@@ -201,7 +202,7 @@ class OntBuilder(object):
         for setting_name, each_setting in app_model.settings.style_guide.items():
             #style guide
             self.set_style(setting_name, each_setting)
-            self.global_values[setting_name] = each_setting
+            self.global_values[setting_name] = each_setting if setting_name is not DotMap() else None
         
         '''
             # Breaking change - added to app.config.ts - values may not be on older version
@@ -210,23 +211,25 @@ class OntBuilder(object):
             applicationLocales = ["en","es"]
             startSessionPath = "/auth/login"
         '''
-        if getattr(self.global_values,"serviceType",None) is None:
-            self.global_values["serviceType"] = "OntimizeEE"
-        if getattr(self.global_values,"locale",None) is None:
-            self.global_values["locale"] =  ["en","es"]
-        if getattr(self.global_values,"applicationLocales",None) is None:
-            self.global_values["applicationLocales"] = "en"
-        if getattr(self.global_values,"startSessionPath",None) is None:
-            self.global_values["startSessionPath"] = "/auth/login"
-        if getattr(self.global_values,"exclude_listpicker",None) is None:
+        if getattr(self.global_values,"serviceType",None) is None  or getattr(self.global_values,"serviceType",None) == DotMap():
+            self.global_values["serviceType"] = "JSONAPI"
+        if getattr(self.global_values,"locale",None) is None or getattr(self.global_values,"locale",None) == DotMap():
+            self.global_values["locale"] =  "en"
+        if getattr(self.global_values,"applicationLocales",None) is None or getattr(self.global_values,"applicationLocales",None) == DotMap():
+            self.global_values["applicationLocales"] =  ['en','es']
+    
+        if getattr(self.global_values,"exclude_listpicker",None) is None or getattr(self.global_values,"exclude_listpicker",None) == DotMap():
             self.global_values["exclude_listpicker"] = False
+
+        self.global_values["startSessionPath"] = '/auth/login'
+        self.global_values["api_endpoint"] = self.apiEndpoint
             
         # If the application yaml has been included = we will use the values from the yaml
         if "application" in app_model:
             for app in app_model.application:
                 # yaml may have multiple apps = only work on the one selected app-build --app={app}
-                if self.app != app:
-                    continue
+                #if self.app != app:
+                #    continue
                 menu_group = app_model.application[app]["menu_group"] 
                 for mg in menu_group:
                     for mi in menu_group[mg]["menu_item"]:
@@ -234,12 +237,13 @@ class OntBuilder(object):
                         for p in menu_group[mg]["menu_item"][mi]["page"]:
                             if p == 'home':
                                 self.generate_home_template(app_path, entity_favorites, mi, each_entity, mi)
+                                home_template_name = menu_group[mg]["menu_item"][mi]["page"][p]["template_name"]
+                                self.generate_routing(app_path, mi, each_entity, mi, home_template_name)
                             elif p == "detail":
                                 self.generate_detail_template(app_path, entity_favorites, mi, each_entity, mi)
                             elif p == "new":
                                 self.generate_new_template(app_path, entity_favorites, mi, each_entity, mi)
                             
-                        self.generate_routing(app_path, mi, each_entity, mi)
                         self.generate_card_home_template(app_path, entity_favorites, mi, each_entity, mi)
         else:
             for each_entity_name, each_entity in app_model.entities.items():
@@ -250,10 +254,11 @@ class OntBuilder(object):
                 entity_name = each_entity_name
                 
                 # Each entity will have a home, new, detail, routing template
+                template_name = self.find_template(each_entity, "home_template","home_template.html")    
                 self.generate_home_template(app_path, entity_favorites, each_entity_name, each_entity, entity_name)
                 self.generate_new_template(app_path, entity_favorites, each_entity_name, each_entity, entity_name)
                 self.generate_detail_template(app_path, entity_favorites, each_entity_name, each_entity, entity_name)
-                self.generate_routing(app_path, each_entity_name, each_entity, entity_name)
+                self.generate_routing(app_path, each_entity_name, each_entity, entity_name, template_name)
                 self.generate_card_home_template(app_path, entity_favorites, each_entity_name, each_entity, entity_name)
             
         # menu groups/routing and service config
@@ -269,7 +274,8 @@ class OntBuilder(object):
         # Generates KeyCloak or SQL Auth - if already set - do not overwrite - use rebuild=from
         self.gen_auth_components(app_path, keycloak_args, self.use_keycloak,overwrite=False)
         rv_app_config = self.gen_app_config()
-        rv_environment = self.environment_template.render(apiEndpoint=self.apiEndpoint)
+        apiEndpoint = self.global_values.api_endpoint or self.apiEndpoint
+        rv_environment = self.environment_template.render(apiEndpoint=apiEndpoint)
         write_root_file(
             app_path=app_path,
             dir_name="environments",
@@ -288,8 +294,7 @@ class OntBuilder(object):
             file_name="app.config.ts",
             source=app_config,
         )
-    def generate_routing(self, app_path, each_entity_name, each_entity, entity_name):
-        home_template_name = self.find_template(each_entity, "home_template","home_template.html")
+    def generate_routing(self, app_path, each_entity_name, each_entity, entity_name, home_template_name:str ):
         if home_template_name == "home_tree_template.html":
             routing = self.load_routing("tree_routing.jinja", entity_name, each_entity)
         else:
@@ -317,20 +322,20 @@ class OntBuilder(object):
         )
 
     def build_entity_list_from_app(self):
-        entity_list = self.app_model.entities.items()
+        entity_list = self.app_model.entities
         if "application" in self.app_model:
-            entities = []
+            entities = {}
             for app in self.app_model.application:
                 # yaml may have multiple apps = only work on the one selected app-build --app={app}
-                if self.app != app:
-                    continue
+                #if self.app != app:
+                #    continue
                 menu_group = self.app_model.application[app]["menu_group"] 
                 for mg in menu_group:
                     for mi in menu_group[mg]["menu_item"]:
                         each_entity = self.app_model.entities[mi]
-                        for each_entity_name, each_entity in entity_list:
+                        for each_entity_name, each_entity in entity_list.items():
                             if each_entity_name == mi:
-                                entities.append((mi,each_entity))
+                                entities[mi] = each_entity
             return entities
                         
         return entity_list
@@ -438,7 +443,7 @@ class OntBuilder(object):
     def build_entity_favorites(self):
         entity_favorites = []
         entity_list = self.build_entity_list_from_app()
-        for each_entity_name, each_entity in entity_list:
+        for each_entity_name, each_entity in entity_list.items():
             datatype = 'INTEGER'
             pkey_datatype = 'INTEGER'
             primary_key = each_entity["primary_key"]
@@ -504,7 +509,7 @@ class OntBuilder(object):
             
     def get_entity(self, entity_name):
         entity_list = self.build_entity_list_from_app()
-        for each_entity_name, each_entity in entity_list:
+        for each_entity_name, each_entity in entity_list.items():
             if each_entity_name == entity_name:
                 return each_entity
         
@@ -541,9 +546,9 @@ class OntBuilder(object):
         return template.render(entity_vars)
 
     def load_home_template(self, template_name: str, entity: any, entity_name:str, entity_favorites: any) -> str:
-        template = self.get_template(template_name)
+        template = self.get_template(template_name) or self.get_template("home_template.html")
         entity_vars = self.get_entity_vars(entity_name=entity_name, entity=entity)
-        entity_vars["row_columns"] = self.get_entity_columns(entity)
+        entity_vars["row_columns"] = self.get_entity_columns(entity, entity_vars=entity_vars)
         entity_vars["has_tabs"] = False
         if template_name.endswith("_expand.html"):
             self.gen_expanded_template(entity, entity_favorites, entity_vars)
@@ -571,13 +576,14 @@ class OntBuilder(object):
             entity_vars["single_tab_panel"] = self.single_tab_panel.render(tab_vars)
             entity_vars["has_tabs"] = True
 
-    def get_entity_columns(self, entity):
+    def get_entity_columns(self, entity, entity_vars: dict = None) -> list:
         row_cols = []
-        for column in entity.columns:
-            if column.get("exclude", "false") == "true":
-                continue
-            rv = self.gen_home_columns(entity, entity, column)
-            row_cols.append(rv)
+        
+        visible_columns = entity_vars["visibleColumns"].split(";") if entity_vars else entity.columns
+        for col in visible_columns:
+            if column := find_column(entity, col):
+                rv = self.gen_home_columns(entity, entity, column)
+                row_cols.append(rv)
         return row_cols
 
     def get_entity_vars(self, entity_name:str, entity, page_name: str = "home") -> dict:
@@ -588,7 +594,7 @@ class OntBuilder(object):
         fav_column = find_column(entity,favorite)
         if page := self.get_page(page_name, entity.type):
             cols = page.visible_columns.replace(",",";",100)
-            visible_columns = page.visible_columns.replace(",",";",100)
+            visible_columns = page.visible_columns.replace(" ","",100).replace(",",";",100)
         else:
             cols = self.get_columns(entity)
             visible_columns = self.get_visible_columns(entity, True)
@@ -651,24 +657,24 @@ class OntBuilder(object):
     
     def get_columns(self, entity) -> str:
         cols = []
-        for column in entity.columns:
-            cols.append(column.name)
+        cols.extend(column.name for column in entity.columns)
         return ";".join(cols)
     
     def get_page(self, page_name, entity_name: str) -> dict:
+        #page_name = home, detail, new
         if "application" in self.app_model:
             for app in self.app_model.application:
                 # yaml may have multiple apps = only work on the one selected app-build --app={app}
-                if self.app != app:
-                    continue
+                #if self.app != app:
+                #    continue
                 menu_group = self.app_model.application[app]["menu_group"] 
                 for mg in menu_group:
                     for mi in menu_group[mg]["menu_item"]:
                         #each_entity = self.app_model.entities[mi]
                         if mi == entity_name:
-                            for p in menu_group[mg]["menu_item"][mi]["page"]:
-                                if page_name == p:
-                                    return menu_group[mg]["menu_item"][mi]["page"][p]
+                            for pg_name in menu_group[mg]["menu_item"][mi]["page"]:
+                                if page_name == pg_name:
+                                    return menu_group[mg]["menu_item"][mi]["page"][pg_name]
         return None
     def get_menu_group(self):
         menu_groups = []
@@ -677,13 +683,13 @@ class OntBuilder(object):
         if "application" in self.app_model:
             for app in self.app_model.application:
                 # yaml may have multiple apps = only work on the one selected app-build --app={app}
-                if self.app != app:
-                    continue
+                #if self.app != app:
+                #    continue
                 menu_group = self.app_model.application[app]["menu_group"]
                 for mg in menu_group:
                     entities = []
                     for mi in menu_group[mg]["menu_item"]:
-                        for entity_name, each_entity in entity_list:
+                        for entity_name, each_entity in entity_list.items():
                             if entity_name == mi:
                                 get_group(menu_groups, mg, each_entity)
         return menu_groups
@@ -695,6 +701,7 @@ class OntBuilder(object):
         # Lookup real Entity Table Name Here 
         self.title_translation.append({title: entity_name})
     def gen_home_columns(self, entity, parent_entity, column):
+        # sourcery skip: low-code-quality
         col_var = self.get_column_attrs(column)
         if getattr(entity,"tab_groups",None) != None:
                 for tg in entity["tab_groups"]:
@@ -718,9 +725,11 @@ class OntBuilder(object):
         elif template_type == 'INTEGER':
             return self.table_integer_template.render(col_var)
         elif template_type == "DATE":
-            return self.date_template.render(col_var)
+            return self.table_column.render(col_var)
+            #return self.date_template.render(col_var)
         elif template_type == "TIMESTAMP":
-            return self.timestamp_template.render(col_var)
+            return self.table_column.render(col_var)
+            #return self.timestamp_template.render(col_var)
         elif template_type in ["REAL", "DECIMAL", "NUMERIC"]:
             return self.table_real_template.render(col_var)
         elif template_type == "table_column":
@@ -729,7 +738,8 @@ class OntBuilder(object):
             return self.check_circle_template.render(col_var)
         else:
             if template_type == "TEXTAREA":
-                return self.table_textarea_template.render(col_var)
+                return self.table_column.render(col_var)
+                #return self.table_textarea_template.render(col_var)
             else:
                 return self.table_text_template.render(col_var)
     
@@ -738,7 +748,7 @@ class OntBuilder(object):
         if hasattr(column, "template") and column.template != DotMap():
             return column.template.upper()
         if hasattr(column, "type") and column.type != DotMap():
-            if column.type.startswith("DECIMAL") or column.type.startswith("NUMERIC"):
+            if column.type.startswith("DECIMAL") or column.type.startswith("NUMERIC") or column.type.startswith("FLOAT"):
                 return "REAL"
             elif column.type == 'INTEGER':
                 return "INTEGER"
@@ -762,9 +772,15 @@ class OntBuilder(object):
         fks = get_foreign_keys(entity, favorites)
         row_cols = []
         defaultValues = {}
-        for column in entity.columns:
-            rv = self.get_new_column(column, fks, entity)
-            row_cols.append(rv)
+        if page := self.get_page("new", entity.type):
+            visible_columns = page.visible_columns.replace(" ","",100).replace(",",";",100)
+        else:
+            visible_columns = self.get_visible_columns(entity, True)
+        for col in  visible_columns.split(";"):
+            for column in entity.columns:
+                if col == column.name:
+                    rv = self.get_new_column(column, fks, entity)
+                    row_cols.append(rv)
 
         entity_vars["row_columns"] = row_cols
         return template.render(entity_vars)
@@ -833,11 +849,17 @@ class OntBuilder(object):
         entity_vars = self.get_entity_vars(entity_name, entity)
         fks = get_foreign_keys(entity, favorites)
         row_cols = []
-        for column in entity.columns:
-            if column.get("exclude", "false") == "true":
-                continue
-            rv = self.gen_detail_rows(column, fks, entity)
-            row_cols.append(rv)
+        if page := self.get_page("detail", entity.type):
+            visible_columns = page.visible_columns.replace(" ","",100).replace(",",";",100)
+        else:
+            visible_columns = self.get_visible_columns(entity, True)
+        for col in  visible_columns.split(";"):
+            for column in entity.columns:
+                if col == column.name:
+                    if column.get("exclude", "false") == "true":
+                        continue
+                    rv = self.gen_detail_rows(column, fks, entity)
+                    row_cols.append(rv)
 
         entity_vars["row_columns"] = row_cols
         entity_vars["has_tabs"] = len(fks) > 0
@@ -893,12 +915,18 @@ class OntBuilder(object):
         entity_vars = self.get_entity_vars(entity.type, entity, 'detail')
         template_var |= entity_vars
         row_cols = []
-        for column in entity.columns:
-            if column.get("exclude", "false") == "true":
-                continue
-            rv = self.gen_home_columns(entity,parent_entity, column)
-            row_cols.append(rv)
-                
+        if page := self.get_page("home", entity.type):
+            visible_columns = page.visible_columns.replace(" ","",100).replace(",",";",100)
+        else:
+            visible_columns = self.get_visible_columns(entity, True)
+        for col in  visible_columns.split(";"):
+            for column in entity.columns:
+                if col == column.name:
+                    if column.get("exclude", "false") == "true":
+                        continue
+                    rv = self.gen_home_columns(entity,parent_entity, column)
+                    row_cols.append(rv)
+        template_var['visibleColumns'] = visible_columns      
         template_var["row_columns"] = row_cols
         return  tab_template.render(template_var)
 
@@ -925,7 +953,7 @@ class OntBuilder(object):
                 tab_name, tab_vars = self.get_tab_attrs(entity, parent_entity, fk_tab)
                 primaryKey = make_keys(entity["primary_key"])
                 entity_list = self.build_entity_list_from_app()
-                for each_entity_name, each_entity in entity_list:
+                for each_entity_name, each_entity in entity_list.items():
                     if each_entity_name == tab_name:
                         template = self.load_tab_template(each_entity,entity,tab_vars, primaryKey )
                         panels.append(template)
@@ -999,7 +1027,7 @@ class OntBuilder(object):
 
         sidebarTemplate = self.sidebar_template
         # sep = ","
-        for each_entity_name, each_entity in entities:
+        for each_entity_name, each_entity in entities.items():
             name = each_entity_name
             entity_first_cap = f"{name[:1].upper()}{name[1:]}"
             var = {"entity": name, "entity_first_cap": entity_first_cap}
@@ -1081,7 +1109,7 @@ class OntBuilder(object):
             if tg.direction == "tomany":
                 var["tab_name"] = tg.resource
                 var["tab_key"] = tg.fks[0]
-                if next((e for e in entity_list if e[0] == tg.resource), None):
+                if next((e for e in entity_list if e == tg.resource), None):
                     additional_routes += f",{self.detail_route_template.render(var)}"
 
         var["additional_routes"] = additional_routes
@@ -1119,7 +1147,7 @@ class OntBuilder(object):
         menu_separator = ""
         groups = self.get_menu_group()
         if len(groups) == 0:
-            for each_entity_name, each_entity in entities:
+            for each_entity_name, each_entity in entities.items():
                 group =  getattr(each_entity, "group") or "data" 
                 get_group(groups, group, each_entity)
         
@@ -1300,12 +1328,12 @@ def find_column(entity, column_name) -> any:
     )
 
 def gen_app_service_config(entities: any) -> str:
-    t = Template("export const SERVICE_CONFIG: Object ={ {{ children }} };")
+    t = Template("export const SERVICE_CONFIG ={ {{ children }} };")
     child_template = Template("'{{ name }}': { 'path': '/{{ name }}' }")
     sep = ""
     config = ""
     children = ""
-    for each_entity_name, each_entity in entities:
+    for each_entity_name, each_entity in entities.items():
         name = each_entity_name
         title = each_entity["label"].replace("*","") if hasattr(each_entity, "label") and each_entity.label != DotMap() else name
         child = child_template.render(title=title, name=name)

api_logic_server_cli/create_from_model/ont_create.py

@@ -268,10 +268,10 @@ class OntCreator(object):
                         each_attribute.type = "text"
                         each_attribute.template = "text"
                     else:
-                        each_attribute.type = resource_attribute.db_type
+                        each_attribute.type = resource_attribute.db_type.upper().split("(")[0] #VARCHAR, DECIMAL, NUMERIC, etc
                         each_attribute.template = self.compute_field_template(each_attribute)
-                    if hasattr(resource_attribute,"default"):
-                        each_attribute.default = resource_attribute.default
+                    if hasattr(resource_attribute,"default") and "::" not in resource_attribute.default:
+                            each_attribute.default = resource_attribute.default
         return each_attribute
 
 
@@ -286,7 +286,7 @@ class OntCreator(object):
         """
         if hasattr(column, "type") and column.type != DotMap():
             col_type = column.type.upper().split("(")[0]
-            if col_type in ["SERIAL","SERIAL4"]:
+            if col_type in ["SERIAL","SERIAL4","SERIAL8"]:
                 rv = "nif"
             if col_type in ["DECIMAL","NUMERIC"]:
                 rv = "real"  
@@ -316,6 +316,7 @@ class OntCreator(object):
     def style_guide(self) -> DotMap:
         style_guide = DotMap()
         # GLOBAL Style settings for all forms
+        style_guide.api_endpoint = "http://localhost:5656/api" # "http://localhost:8080"
         style_guide.mode = "tab" # "dialog"
         style_guide.pick_style = "list"  #"combo" or"list"
         style_guide.style = "light" # "dark"
@@ -323,7 +324,7 @@ class OntCreator(object):
         style_guide.currency_symbol_position="left" # "right"
         style_guide.thousand_separator="," # "."
         style_guide.decimal_separator="." # ","
-        style_guide.date_format="LL" #not sure what this means
+        style_guide.date_format="YYYY-MM-DD" #not sure what this means
         style_guide.edit_on_mode = "dblclick" # edit #click
         style_guide.min_decimal_digits="2"
         style_guide.max_decimal_digits="4" 
@@ -334,7 +335,7 @@ class OntCreator(object):
         style_guide.keycloak_url= "http://localhost:8080"
         style_guide.keycloak_realm = "kcals"
         style_guide.keycloak_client_id = "alsclient"
-        style_guide.serviceType = "OntimizeEE" #or JSONAPI
+        style_guide.serviceType = "JSONAPI" # OntimizeEE or JSONAPI
         style_guide.locale = "en"
         style_guide.applicationLocales = ["en","es"]
         style_guide.startSessionPath = "/auth/login" #Used by JSONAPI only

api_logic_server_cli/database/basic_demo.txt

@@ -0,0 +1 @@
+see tests/test_databases/basic_demo/basic_demo.sql

api_logic_server_cli/database/nw-gold-fix.sql

@@ -0,0 +1,62 @@
+Alter table "Product" rename to TempData;
+
+CREATE TABLE "Product" (
+  "Id" INTEGER PRIMARY KEY AUTOINCREMENT, 
+  "ProductName" VARCHAR(8000) NULL, 
+  "SupplierId" INTEGER NOT NULL, 
+  "CategoryId" INTEGER NOT NULL, 
+  "QuantityPerUnit" VARCHAR(8000) NULL, 
+  "UnitPrice" DECIMAL NOT NULL, 
+  "UnitsInStock" INTEGER NOT NULL, 
+  "UnitsOnOrder" INTEGER NOT NULL, 
+  "ReorderLevel" INTEGER NOT NULL, 
+  "Discontinued" INTEGER NOT NULL,
+  "UnitsShipped" INTEGER,
+  FOREIGN KEY("CategoryId") REFERENCES "CategoryTableNameTest"("Id")
+);
+
+INSERT INTO Product  
+SELECT *
+FROM TempData;
+
+
+Drop table TempData;
+
+
+Alter table "OrderDetail" rename to TempData1;
+
+CREATE TABLE OrderDetail (
+	"Id"	INTEGER,
+	"OrderId"	INTEGER NOT NULL,
+	"ProductId"	INTEGER NOT NULL,
+	"UnitPrice"	DECIMAL,
+	"Quantity"	INTEGER NOT NULL DEFAULT 1,
+	"Discount"	DOUBLE DEFAULT 0,
+	"Amount"	Decimal,
+	"ShippedDate"	VARCHAR(8000),
+	PRIMARY KEY("Id" AUTOINCREMENT),
+	FOREIGN KEY("OrderId") REFERENCES "Order" on delete cascade
+    FOREIGN KEY("ProductId") REFERENCES "Product" on delete set null
+);
+
+INSERT INTO OrderDetail  
+SELECT *
+FROM TempData1;
+
+
+drop table TempData1;
+
+
+CREATE VIEW ProductDetails_View as
+select 
+p.*, 
+c.CategoryName_ColumnName, c.Description as [CategoryDescription],
+s.CompanyName as [SupplierName], s.Region as [SupplierRegion]
+from "Product" p
+join "CategoryTableNameTest" c on p.CategoryId = c.id
+join [Supplier] s on s.id = p.SupplierId
+
+
+INSERT INTO Region (RegionDescription)
+SELECT DISTINCT ShipRegion
+FROM "Order";

api_logic_server_cli/{prototypes/manager/webgenai → fragments}/docker-compose.yml

@@ -1,4 +1,4 @@
-# Run WebGenAI locally from docker container
+# Run WebGenAI locally from docker container (created by Manager)
 
 # cd webgenai