Fixed grammar builder stuff

embeddings_data_models.py

@@ -231,13 +231,6 @@ class ShowLogsIncrementalModel(BaseModel):
     logs: str
     last_position: int
 
-class GrammarBuilderRequest(BaseModel):
-    sample_json: Optional[dict]
-    pydantic_model_description: Optional[str]
-
-class GrammarBuilderResponse(BaseModel):
-    bnf_grammar: str
-
 class AddGrammarRequest(BaseModel):
     bnf_grammar: str
     grammar_file_name: str

grammar_builder.py

@@ -1,3 +1,4 @@
+from service_functions import validate_bnf_grammar_func
 from typing import List, Dict
 import json
 
@@ -196,10 +197,15 @@ def json_to_bnf(self, json_str):
     }
     }
     '''
-
+    print('\n' + '_' * 80 + '\n')
     bnf_grammar = gb.json_to_bnf(sample_json)
     print(bnf_grammar)
     print('\n' + '_' * 80 + '\n')
+    print("Validating grammar...")
+    is_valid, validation_message = validate_bnf_grammar_func(bnf_grammar)
+    print(validation_message)
+
+    print('\n\n\n')
 
     gb = GrammarBuilder()
     sample_pydantic_model_description = '''
@@ -220,4 +226,8 @@ class AudioTranscriptResponse(BaseModel):
 
     bnf_grammar = gb.pydantic_to_json_bnf(sample_pydantic_model_description)
     print(bnf_grammar)
+    print('\n' + '_' * 80 + '\n')
+    print("Validating grammar...")
+    is_valid, validation_message = validate_bnf_grammar_func(bnf_grammar)
+    print(validation_message)
 

service_functions.py

@@ -616,7 +616,7 @@ async def generate_completion_from_llm(request: TextCompletionRequest, req: Requ
         list_of_responses.append(response)
     return list_of_responses
 
-def validate_bnf_grammar_revised(grammar):
+def validate_bnf_grammar_func(grammar):
     defined_rules, used_rules = set(), set()
     for line in grammar.strip().split('\n'):
         if '::=' not in line: