|
2 | 2 | from exllamav2 import ExLlamaV2, ExLlamaV2Tokenizer |
3 | 3 | from exllamav2.generator import ExLlamaV2Sampler |
4 | 4 | from exllamav2.generator.filters import ExLlamaV2Filter, ExLlamaV2PrefixFilter |
| 5 | +from lmformatenforcer import JsonSchemaParser, RegexParser |
| 6 | +from lmformatenforcer.integrations.exllamav2 import ExLlamaV2TokenEnforcerFilter |
5 | 7 | from loguru import logger |
6 | 8 |
|
7 | 9 |
|
@@ -61,23 +63,6 @@ def add_json_schema_filter( |
61 | 63 | ): |
62 | 64 | """Adds an ExllamaV2 filter based on a JSON schema.""" |
63 | 65 |
|
64 | | - # Import optional dependencies |
65 | | - try: |
66 | | - from lmformatenforcer import JsonSchemaParser |
67 | | - from lmformatenforcer.integrations.exllamav2 import ( |
68 | | - ExLlamaV2TokenEnforcerFilter, |
69 | | - ) |
70 | | - except ImportError: |
71 | | - logger.error( |
72 | | - "Skipping JSON schema parsing because " |
73 | | - "lm-format-enforcer is not installed.\n" |
74 | | - "Please run the following command in your environment " |
75 | | - "to reinstall dependencies:\n" |
76 | | - "pip install -U ." |
77 | | - ) |
78 | | - |
79 | | - return |
80 | | - |
81 | 66 | # Create the parser |
82 | 67 | try: |
83 | 68 | schema_parser = JsonSchemaParser(json_schema) |
@@ -105,23 +90,6 @@ def add_regex_filter( |
105 | 90 | ): |
106 | 91 | """Adds an ExllamaV2 filter based on regular expressions.""" |
107 | 92 |
|
108 | | - # Import optional dependencies |
109 | | - try: |
110 | | - from lmformatenforcer import RegexParser |
111 | | - from lmformatenforcer.integrations.exllamav2 import ( |
112 | | - ExLlamaV2TokenEnforcerFilter, |
113 | | - ) |
114 | | - except ImportError: |
115 | | - logger.error( |
116 | | - "Skipping regex parsing because " |
117 | | - "lm-format-enforcer is not installed.\n" |
118 | | - "Please run the following command in your environment " |
119 | | - "to reinstall dependencies:\n" |
120 | | - "pip install -U ." |
121 | | - ) |
122 | | - |
123 | | - return |
124 | | - |
125 | 93 | # Create the parser |
126 | 94 | try: |
127 | 95 | pattern_parser = RegexParser(pattern) |
|
0 commit comments