sql-assignment-generator 0.0.7__tar.gz → 0.0.8__tar.gz

{sql_assignment_generator-0.0.7 → sql_assignment_generator-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sql_assignment_generator
-Version: 0.0.7
+Version: 0.0.8
 Summary: This project generates SQL assignments based on common mistakes made by learners.
 Project-URL: Repository, https://github.com/DavidePonzini/sql_assignment_generator
 Project-URL: Documentation, https://sql-assignment-generator.readthedocs.io/en/latest/index.html

{sql_assignment_generator-0.0.7 → sql_assignment_generator-0.0.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "sql_assignment_generator"
-version = "0.0.7"
+version = "0.0.8"
 authors = [
   { name="Davide Ponzini", email="davide.ponzini95@gmail.com" },
 ]

{sql_assignment_generator-0.0.7 → sql_assignment_generator-0.0.8}/src/sql_assignment_generator/assignments/dataset.py

@@ -6,7 +6,7 @@ from sql_error_categorizer.sql_errors import SqlErrors
 from ..sql_errors_details import ERROR_DETAILS_MAP
 from ..difficulty_level import DifficultyLevel
 from ..constraints.schema import TableAmountConstraint, ColumnAmountConstraint, InsertAmountConstraint, HasCheckConstraint, HasSamePrimaryKeyConstraint
-
+import sqlglot
 
 @dataclass
 class Dataset:
@@ -27,8 +27,8 @@ class Dataset:
         # Normalize schema name
         schema = schema.lower().replace(' ', '_')
 
-        create_cmds = '\n'.join(self.create_commands)
-        insert_cmds = '\n'.join(self.insert_commands)
+        create_cmds = '\n\n'.join(self.create_commands)
+        insert_cmds = '\n\n'.join(self.insert_commands)
 
         return f'''BEGIN;
 
@@ -96,6 +96,8 @@ COMMIT;'''
             try:
                 json_risposta = llm.generate_answer(messages, json_format=llm.models.Schema) 
                 
+                assert isinstance(json_risposta, llm.models.Schema), "The response is not in the expected JSON format."
+
                 #parsing CREATE TABLE
                 parsed_tables = []
                 try:
@@ -124,7 +126,8 @@ COMMIT;'''
                     elif isinstance(constraint, (TableAmountConstraint, ColumnAmountConstraint, HasCheckConstraint, HasSamePrimaryKeyConstraint)):
                          is_satisfied = constraint.validate(None, parsed_tables)
                     
-                    else:  is_satisfied = constraint.validate(parsed_inserts, parsed_tables)
+                    else:
+                        is_satisfied = constraint.validate(parsed_inserts, parsed_tables)
 
                     if not is_satisfied: missing_requirements.append(constraint.description)
 
@@ -132,8 +135,8 @@ COMMIT;'''
                 if not missing_requirements:
                     dav_tools.messages.success(f"Dataset generated and validated successfully at attempt {attempt + 1}.")
                     return Dataset(
-                        create_commands=json_risposta.schema_tables,
-                        insert_commands=json_risposta.insert_commands,
+                        create_commands=[cmd.sql(pretty=True, dialect='postgres') for cmd in parsed_tables],
+                        insert_commands=[cmd.sql(pretty=True, dialect='postgres') for cmd in parsed_inserts],
                         domain=domain
                     )