diff --git a/coverage.xml b/coverage.xml
index 5850def2dfb8bf3ee91ce0e20a28f5312ec8c0b2..7eb662b902de37fa6581d52548d1cf54db5e5be4 100644
--- a/coverage.xml
+++ b/coverage.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" ?>
-<coverage version="7.4.0" timestamp="1704881517474" lines-valid="893" lines-covered="778" line-rate="0.8712" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0">
+<coverage version="7.4.0" timestamp="1707722055292" lines-valid="1402" lines-covered="1188" line-rate="0.8474" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0">
 	<!-- Generated by coverage.py: https://coverage.readthedocs.io/en/7.4.0 -->
 	<!-- Based on https://raw.githubusercontent.com/cobertura/web/master/htdocs/xml/coverage-04.dtd -->
 	<sources>
-		<source>/Users/jakit/customers/aurelio/semantic-router/semantic_router</source>
+		<source>/home/dustinmorris/semantic-router/semantic_router</source>
 	</sources>
 	<packages>
-		<package name="." line-rate="0.9263" branch-rate="0" complexity="0">
+		<package name="." line-rate="0.9055" branch-rate="0" complexity="0">
 			<classes>
 				<class name="__init__.py" filename="__init__.py" complexity="0" line-rate="1" branch-rate="0">
 					<methods/>
@@ -15,310 +15,396 @@
 						<line number="2" hits="1"/>
 						<line number="3" hits="1"/>
 						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
 					</lines>
 				</class>
-				<class name="hybrid_layer.py" filename="hybrid_layer.py" complexity="0" line-rate="0.9796" branch-rate="0">
+				<class name="hybrid_layer.py" filename="hybrid_layer.py" complexity="0" line-rate="0.9808" branch-rate="0">
 					<methods/>
 					<lines>
 						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
 						<line number="4" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
 						<line number="15" hits="1"/>
 						<line number="16" hits="1"/>
 						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
 						<line number="19" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="28" hits="1"/>
 						<line number="29" hits="1"/>
-						<line number="30" hits="0"/>
-						<line number="31" hits="0"/>
-						<line number="33" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="0"/>
+						<line number="33" hits="0"/>
 						<line number="35" hits="1"/>
 						<line number="37" hits="1"/>
-						<line number="41" hits="1"/>
-						<line number="43" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="39" hits="1"/>
+						<line number="42" hits="1"/>
 						<line number="44" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="1"/>
-						<line number="47" hits="1"/>
 						<line number="48" hits="1"/>
 						<line number="50" hits="1"/>
+						<line number="51" hits="1"/>
 						<line number="52" hits="1"/>
 						<line number="53" hits="1"/>
+						<line number="54" hits="1"/>
 						<line number="55" hits="1"/>
 						<line number="57" hits="1"/>
-						<line number="58" hits="1"/>
+						<line number="59" hits="1"/>
+						<line number="60" hits="1"/>
+						<line number="62" hits="1"/>
 						<line number="63" hits="1"/>
-						<line number="64" hits="1"/>
 						<line number="65" hits="1"/>
 						<line number="67" hits="1"/>
-						<line number="68" hits="1"/>
-						<line number="69" hits="1"/>
+						<line number="70" hits="1"/>
+						<line number="72" hits="1"/>
 						<line number="73" hits="1"/>
-						<line number="74" hits="1"/>
 						<line number="76" hits="1"/>
 						<line number="78" hits="1"/>
-						<line number="79" hits="1"/>
 						<line number="81" hits="1"/>
-						<line number="83" hits="1"/>
+						<line number="82" hits="1"/>
+						<line number="84" hits="1"/>
 						<line number="85" hits="1"/>
 						<line number="86" hits="1"/>
-						<line number="89" hits="1"/>
+						<line number="88" hits="1"/>
 						<line number="90" hits="1"/>
-						<line number="93" hits="1"/>
+						<line number="91" hits="1"/>
 						<line number="94" hits="1"/>
 						<line number="95" hits="1"/>
-						<line number="102" hits="1"/>
+						<line number="98" hits="1"/>
+						<line number="99" hits="1"/>
+						<line number="100" hits="1"/>
+						<line number="106" hits="1"/>
+						<line number="107" hits="1"/>
 						<line number="109" hits="1"/>
 						<line number="115" hits="1"/>
-						<line number="120" hits="1"/>
-						<line number="121" hits="1"/>
-						<line number="123" hits="1"/>
+						<line number="116" hits="1"/>
+						<line number="118" hits="1"/>
 						<line number="124" hits="1"/>
-						<line number="126" hits="1"/>
-						<line number="128" hits="1"/>
+						<line number="129" hits="1"/>
 						<line number="130" hits="1"/>
-						<line number="131" hits="1"/>
 						<line number="132" hits="1"/>
-						<line number="134" hits="1"/>
+						<line number="133" hits="1"/>
 						<line number="135" hits="1"/>
-						<line number="136" hits="1"/>
 						<line number="137" hits="1"/>
 						<line number="139" hits="1"/>
 						<line number="140" hits="1"/>
 						<line number="141" hits="1"/>
 						<line number="143" hits="1"/>
 						<line number="144" hits="1"/>
+						<line number="145" hits="1"/>
 						<line number="146" hits="1"/>
-						<line number="147" hits="1"/>
+						<line number="148" hits="1"/>
 						<line number="149" hits="1"/>
-						<line number="151" hits="1"/>
+						<line number="150" hits="1"/>
 						<line number="152" hits="1"/>
 						<line number="153" hits="1"/>
 						<line number="155" hits="1"/>
 						<line number="156" hits="1"/>
-						<line number="157" hits="1"/>
 						<line number="158" hits="1"/>
-						<line number="159" hits="1"/>
 						<line number="160" hits="1"/>
 						<line number="161" hits="1"/>
-						<line number="163" hits="1"/>
+						<line number="162" hits="1"/>
+						<line number="164" hits="1"/>
+						<line number="165" hits="1"/>
 						<line number="166" hits="1"/>
 						<line number="167" hits="1"/>
+						<line number="168" hits="1"/>
+						<line number="169" hits="1"/>
 						<line number="170" hits="1"/>
-						<line number="171" hits="1"/>
-						<line number="173" hits="1"/>
-						<line number="174" hits="1"/>
+						<line number="172" hits="1"/>
+						<line number="175" hits="1"/>
 						<line number="176" hits="1"/>
-						<line number="177" hits="1"/>
-						<line number="178" hits="1"/>
+						<line number="179" hits="1"/>
 						<line number="180" hits="1"/>
+						<line number="182" hits="1"/>
+						<line number="183" hits="1"/>
+						<line number="185" hits="1"/>
+						<line number="186" hits="1"/>
+						<line number="187" hits="1"/>
+						<line number="189" hits="1"/>
 					</lines>
 				</class>
-				<class name="layer.py" filename="layer.py" complexity="0" line-rate="0.8827" branch-rate="0">
+				<class name="layer.py" filename="layer.py" complexity="0" line-rate="0.9055" branch-rate="0">
 					<methods/>
 					<lines>
 						<line number="1" hits="1"/>
 						<line number="2" hits="1"/>
 						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
+						<line number="4" hits="1"/>
 						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
 						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
 						<line number="10" hits="1"/>
 						<line number="11" hits="1"/>
 						<line number="12" hits="1"/>
 						<line number="13" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
 						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
 						<line number="21" hits="1"/>
-						<line number="22" hits="0"/>
-						<line number="23" hits="0"/>
-						<line number="24" hits="0"/>
+						<line number="22" hits="1"/>
+						<line number="24" hits="1"/>
 						<line number="25" hits="0"/>
+						<line number="26" hits="0"/>
+						<line number="27" hits="0"/>
 						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="0"/>
+						<line number="31" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
 						<line number="36" hits="0"/>
-						<line number="38" hits="1"/>
 						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
-						<line number="41" hits="0"/>
-						<line number="44" hits="1"/>
-						<line number="50" hits="1"/>
-						<line number="52" hits="1"/>
-						<line number="58" hits="1"/>
-						<line number="59" hits="1"/>
-						<line number="63" hits="1"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="1"/>
-						<line number="66" hits="0"/>
-						<line number="67" hits="1"/>
-						<line number="68" hits="0"/>
-						<line number="69" hits="1"/>
-						<line number="70" hits="0"/>
-						<line number="71" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="47" hits="1"/>
+						<line number="53" hits="1"/>
+						<line number="55" hits="1"/>
+						<line number="61" hits="1"/>
+						<line number="62" hits="1"/>
+						<line number="66" hits="1"/>
+						<line number="67" hits="0"/>
+						<line number="68" hits="1"/>
+						<line number="69" hits="0"/>
+						<line number="70" hits="1"/>
+						<line number="71" hits="0"/>
 						<line number="72" hits="1"/>
-						<line number="73" hits="1"/>
+						<line number="73" hits="0"/>
+						<line number="74" hits="1"/>
 						<line number="75" hits="1"/>
 						<line number="76" hits="1"/>
 						<line number="78" hits="1"/>
 						<line number="79" hits="1"/>
-						<line number="80" hits="1"/>
 						<line number="81" hits="1"/>
 						<line number="82" hits="1"/>
 						<line number="83" hits="1"/>
 						<line number="84" hits="1"/>
+						<line number="85" hits="1"/>
 						<line number="86" hits="1"/>
-						<line number="90" hits="1"/>
-						<line number="91" hits="1"/>
-						<line number="92" hits="1"/>
+						<line number="87" hits="1"/>
+						<line number="89" hits="1"/>
 						<line number="93" hits="1"/>
 						<line number="94" hits="1"/>
 						<line number="95" hits="1"/>
-						<line number="99" hits="1"/>
-						<line number="101" hits="1"/>
-						<line number="102" hits="1"/>
-						<line number="108" hits="1"/>
-						<line number="110" hits="1"/>
+						<line number="96" hits="1"/>
+						<line number="97" hits="1"/>
+						<line number="98" hits="1"/>
+						<line number="102" hits="0"/>
+						<line number="104" hits="1"/>
+						<line number="105" hits="1"/>
 						<line number="111" hits="1"/>
+						<line number="113" hits="1"/>
 						<line number="114" hits="1"/>
-						<line number="115" hits="1"/>
-						<line number="119" hits="1"/>
+						<line number="117" hits="1"/>
+						<line number="118" hits="1"/>
 						<line number="122" hits="1"/>
-						<line number="123" hits="0"/>
 						<line number="125" hits="1"/>
-						<line number="126" hits="1"/>
-						<line number="127" hits="1"/>
+						<line number="126" hits="0"/>
 						<line number="128" hits="1"/>
 						<line number="129" hits="1"/>
+						<line number="130" hits="1"/>
 						<line number="131" hits="1"/>
 						<line number="132" hits="1"/>
-						<line number="133" hits="1"/>
+						<line number="134" hits="1"/>
 						<line number="135" hits="1"/>
 						<line number="136" hits="1"/>
-						<line number="137" hits="1"/>
 						<line number="138" hits="1"/>
 						<line number="139" hits="1"/>
 						<line number="140" hits="1"/>
+						<line number="141" hits="1"/>
 						<line number="142" hits="1"/>
 						<line number="143" hits="1"/>
-						<line number="144" hits="0"/>
+						<line number="145" hits="1"/>
 						<line number="146" hits="1"/>
-						<line number="147" hits="1"/>
+						<line number="147" hits="0"/>
+						<line number="149" hits="1"/>
 						<line number="150" hits="1"/>
-						<line number="151" hits="1"/>
-						<line number="152" hits="1"/>
 						<line number="153" hits="1"/>
 						<line number="154" hits="1"/>
+						<line number="155" hits="1"/>
 						<line number="156" hits="1"/>
-						<line number="162" hits="1"/>
-						<line number="163" hits="1"/>
-						<line number="164" hits="1"/>
+						<line number="157" hits="1"/>
+						<line number="159" hits="1"/>
 						<line number="165" hits="1"/>
 						<line number="166" hits="1"/>
-						<line number="170" hits="1"/>
-						<line number="172" hits="1"/>
+						<line number="167" hits="1"/>
+						<line number="168" hits="1"/>
+						<line number="169" hits="1"/>
 						<line number="173" hits="1"/>
-						<line number="174" hits="1"/>
 						<line number="175" hits="1"/>
+						<line number="176" hits="1"/>
 						<line number="177" hits="1"/>
-						<line number="179" hits="1"/>
+						<line number="178" hits="1"/>
+						<line number="180" hits="1"/>
 						<line number="181" hits="1"/>
 						<line number="182" hits="1"/>
-						<line number="183" hits="1"/>
 						<line number="184" hits="1"/>
-						<line number="185" hits="1"/>
-						<line number="187" hits="1"/>
+						<line number="186" hits="1"/>
 						<line number="188" hits="1"/>
-						<line number="189" hits="0"/>
-						<line number="190" hits="0"/>
-						<line number="195" hits="0"/>
-						<line number="196" hits="0"/>
-						<line number="198" hits="0"/>
-						<line number="199" hits="1"/>
-						<line number="202" hits="1"/>
+						<line number="189" hits="1"/>
+						<line number="190" hits="1"/>
+						<line number="191" hits="1"/>
+						<line number="194" hits="1"/>
+						<line number="195" hits="1"/>
+						<line number="197" hits="1"/>
+						<line number="203" hits="1"/>
 						<line number="204" hits="1"/>
-						<line number="205" hits="0"/>
-						<line number="211" hits="1"/>
+						<line number="205" hits="1"/>
+						<line number="206" hits="1"/>
+						<line number="208" hits="1"/>
+						<line number="210" hits="1"/>
 						<line number="212" hits="1"/>
-						<line number="213" hits="1"/>
 						<line number="214" hits="1"/>
 						<line number="215" hits="1"/>
+						<line number="216" hits="1"/>
 						<line number="217" hits="1"/>
-						<line number="218" hits="1"/>
-						<line number="219" hits="1"/>
-						<line number="220" hits="1"/>
-						<line number="221" hits="1"/>
+						<line number="222" hits="1"/>
 						<line number="223" hits="1"/>
 						<line number="224" hits="1"/>
 						<line number="225" hits="1"/>
-						<line number="226" hits="1"/>
 						<line number="228" hits="1"/>
-						<line number="229" hits="1"/>
-						<line number="231" hits="1"/>
-						<line number="234" hits="1"/>
-						<line number="235" hits="1"/>
-						<line number="237" hits="1"/>
-						<line number="238" hits="1"/>
+						<line number="229" hits="0"/>
+						<line number="230" hits="0"/>
+						<line number="236" hits="0"/>
+						<line number="237" hits="0"/>
+						<line number="239" hits="0"/>
 						<line number="240" hits="1"/>
-						<line number="241" hits="1"/>
 						<line number="243" hits="1"/>
-						<line number="244" hits="1"/>
-						<line number="246" hits="1"/>
-						<line number="248" hits="1"/>
-						<line number="250" hits="1"/>
+						<line number="245" hits="1"/>
+						<line number="246" hits="0"/>
+						<line number="252" hits="1"/>
 						<line number="253" hits="1"/>
+						<line number="254" hits="1"/>
+						<line number="255" hits="1"/>
 						<line number="256" hits="1"/>
-						<line number="257" hits="1"/>
 						<line number="258" hits="1"/>
+						<line number="259" hits="1"/>
+						<line number="260" hits="1"/>
+						<line number="261" hits="1"/>
+						<line number="262" hits="1"/>
+						<line number="264" hits="1"/>
 						<line number="265" hits="1"/>
 						<line number="266" hits="1"/>
+						<line number="267" hits="1"/>
+						<line number="269" hits="1"/>
+						<line number="270" hits="1"/>
 						<line number="272" hits="1"/>
-						<line number="277" hits="1"/>
+						<line number="274" hits="1"/>
+						<line number="275" hits="1"/>
 						<line number="278" hits="1"/>
-						<line number="280" hits="1"/>
+						<line number="279" hits="1"/>
+						<line number="281" hits="1"/>
 						<line number="282" hits="1"/>
-						<line number="283" hits="1"/>
+						<line number="284" hits="1"/>
 						<line number="285" hits="1"/>
-						<line number="286" hits="1"/>
+						<line number="287" hits="1"/>
 						<line number="288" hits="1"/>
-						<line number="289" hits="1"/>
-						<line number="291" hits="1"/>
+						<line number="290" hits="1"/>
 						<line number="292" hits="1"/>
 						<line number="293" hits="1"/>
-						<line number="294" hits="1"/>
 						<line number="295" hits="1"/>
 						<line number="296" hits="1"/>
 						<line number="297" hits="1"/>
+						<line number="298" hits="1"/>
 						<line number="299" hits="1"/>
+						<line number="301" hits="1"/>
 						<line number="302" hits="1"/>
-						<line number="303" hits="1"/>
-						<line number="306" hits="1"/>
-						<line number="307" hits="1"/>
-						<line number="309" hits="1"/>
+						<line number="304" hits="1"/>
+						<line number="305" hits="1"/>
 						<line number="310" hits="1"/>
-						<line number="312" hits="1"/>
+						<line number="311" hits="1"/>
 						<line number="313" hits="1"/>
-						<line number="314" hits="1"/>
-						<line number="316" hits="1"/>
+						<line number="315" hits="1"/>
 						<line number="318" hits="1"/>
-						<line number="319" hits="1"/>
-						<line number="325" hits="1"/>
-						<line number="326" hits="1"/>
-						<line number="327" hits="1"/>
-						<line number="329" hits="1"/>
+						<line number="321" hits="1"/>
+						<line number="322" hits="1"/>
+						<line number="323" hits="1"/>
 						<line number="330" hits="1"/>
 						<line number="331" hits="1"/>
+						<line number="337" hits="1"/>
+						<line number="340" hits="1"/>
+						<line number="341" hits="1"/>
+						<line number="342" hits="1"/>
+						<line number="344" hits="1"/>
+						<line number="346" hits="1"/>
+						<line number="348" hits="1"/>
+						<line number="349" hits="1"/>
+						<line number="351" hits="1"/>
+						<line number="352" hits="1"/>
+						<line number="354" hits="1"/>
+						<line number="355" hits="1"/>
+						<line number="357" hits="1"/>
+						<line number="358" hits="1"/>
+						<line number="359" hits="1"/>
+						<line number="360" hits="1"/>
+						<line number="361" hits="1"/>
+						<line number="362" hits="1"/>
+						<line number="363" hits="1"/>
+						<line number="365" hits="1"/>
+						<line number="368" hits="1"/>
+						<line number="369" hits="1"/>
+						<line number="372" hits="1"/>
+						<line number="373" hits="1"/>
+						<line number="375" hits="1"/>
+						<line number="376" hits="1"/>
+						<line number="378" hits="1"/>
+						<line number="379" hits="1"/>
+						<line number="380" hits="1"/>
+						<line number="382" hits="1"/>
+						<line number="384" hits="1"/>
+						<line number="388" hits="1"/>
+						<line number="389" hits="1"/>
+						<line number="390" hits="1"/>
+						<line number="394" hits="1"/>
+						<line number="395" hits="1"/>
+						<line number="401" hits="1"/>
+						<line number="402" hits="1"/>
+						<line number="403" hits="1"/>
+						<line number="405" hits="1"/>
+						<line number="406" hits="1"/>
+						<line number="407" hits="1"/>
+						<line number="409" hits="1"/>
+						<line number="411" hits="1"/>
+						<line number="415" hits="1"/>
+						<line number="417" hits="1"/>
+						<line number="424" hits="1"/>
+						<line number="426" hits="1"/>
+						<line number="427" hits="1"/>
+						<line number="429" hits="1"/>
+						<line number="430" hits="1"/>
+						<line number="432" hits="1"/>
+						<line number="437" hits="1"/>
+						<line number="439" hits="1"/>
+						<line number="441" hits="1"/>
+						<line number="442" hits="0"/>
+						<line number="443" hits="0"/>
+						<line number="445" hits="1"/>
+						<line number="447" hits="1"/>
+						<line number="451" hits="1"/>
+						<line number="452" hits="1"/>
+						<line number="453" hits="1"/>
+						<line number="455" hits="1"/>
+						<line number="459" hits="1"/>
+						<line number="460" hits="1"/>
+						<line number="461" hits="1"/>
+						<line number="462" hits="1"/>
+						<line number="463" hits="1"/>
+						<line number="464" hits="1"/>
+						<line number="465" hits="1"/>
+						<line number="468" hits="1"/>
+						<line number="474" hits="1"/>
+						<line number="475" hits="1"/>
+						<line number="476" hits="1"/>
+						<line number="478" hits="1"/>
+						<line number="479" hits="1"/>
+						<line number="480" hits="1"/>
+						<line number="488" hits="1"/>
+						<line number="492" hits="1"/>
 					</lines>
 				</class>
 				<class name="linear.py" filename="linear.py" complexity="0" line-rate="1" branch-rate="0">
@@ -339,7 +425,7 @@
 						<line number="30" hits="1"/>
 					</lines>
 				</class>
-				<class name="route.py" filename="route.py" complexity="0" line-rate="0.9342" branch-rate="0">
+				<class name="route.py" filename="route.py" complexity="0" line-rate="0.9103" branch-rate="0">
 					<methods/>
 					<lines>
 						<line number="1" hits="1"/>
@@ -350,26 +436,26 @@
 						<line number="8" hits="1"/>
 						<line number="9" hits="1"/>
 						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
+						<line number="13" hits="1"/>
 						<line number="14" hits="1"/>
 						<line number="15" hits="1"/>
 						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
 						<line number="19" hits="1"/>
 						<line number="20" hits="1"/>
 						<line number="21" hits="1"/>
 						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
+						<line number="25" hits="1"/>
 						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
 						<line number="29" hits="1"/>
 						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="34" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="35" hits="1"/>
 						<line number="36" hits="1"/>
 						<line number="37" hits="1"/>
 						<line number="38" hits="1"/>
-						<line number="39" hits="1"/>
+						<line number="41" hits="1"/>
 						<line number="42" hits="1"/>
 						<line number="43" hits="1"/>
 						<line number="44" hits="1"/>
@@ -380,101 +466,189 @@
 						<line number="50" hits="1"/>
 						<line number="51" hits="1"/>
 						<line number="52" hits="1"/>
+						<line number="56" hits="0"/>
 						<line number="57" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="63" hits="1"/>
-						<line number="64" hits="1"/>
-						<line number="66" hits="1"/>
-						<line number="67" hits="1"/>
+						<line number="62" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="68" hits="1"/>
 						<line number="69" hits="1"/>
-						<line number="70" hits="1"/>
 						<line number="71" hits="1"/>
-						<line number="73" hits="1"/>
+						<line number="72" hits="1"/>
 						<line number="74" hits="1"/>
+						<line number="75" hits="1"/>
+						<line number="76" hits="1"/>
 						<line number="78" hits="1"/>
 						<line number="79" hits="1"/>
-						<line number="80" hits="1"/>
-						<line number="81" hits="1"/>
 						<line number="83" hits="1"/>
 						<line number="84" hits="1"/>
+						<line number="85" hits="1"/>
 						<line number="86" hits="1"/>
-						<line number="87" hits="1"/>
+						<line number="88" hits="1"/>
 						<line number="89" hits="1"/>
-						<line number="90" hits="1"/>
 						<line number="91" hits="1"/>
-						<line number="93" hits="0"/>
+						<line number="92" hits="1"/>
+						<line number="94" hits="1"/>
 						<line number="95" hits="1"/>
 						<line number="96" hits="1"/>
-						<line number="97" hits="1"/>
-						<line number="99" hits="1"/>
-						<line number="124" hits="1"/>
-						<line number="125" hits="1"/>
-						<line number="126" hits="1"/>
-						<line number="127" hits="0"/>
+						<line number="98" hits="0"/>
+						<line number="100" hits="1"/>
+						<line number="101" hits="1"/>
+						<line number="102" hits="1"/>
+						<line number="104" hits="1"/>
 						<line number="129" hits="1"/>
+						<line number="130" hits="1"/>
 						<line number="131" hits="1"/>
-						<line number="133" hits="1"/>
+						<line number="132" hits="0"/>
 						<line number="134" hits="1"/>
-						<line number="135" hits="1"/>
 						<line number="136" hits="1"/>
-						<line number="137" hits="0"/>
+						<line number="138" hits="1"/>
+						<line number="139" hits="1"/>
+						<line number="140" hits="1"/>
+						<line number="141" hits="1"/>
+						<line number="142" hits="0"/>
 					</lines>
 				</class>
-				<class name="schema.py" filename="schema.py" complexity="0" line-rate="0.9574" branch-rate="0">
+				<class name="schema.py" filename="schema.py" complexity="0" line-rate="0.8929" branch-rate="0">
 					<methods/>
 					<lines>
 						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
+						<line number="2" hits="1"/>
 						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="7" hits="1"/>
 						<line number="16" hits="1"/>
 						<line number="17" hits="1"/>
 						<line number="18" hits="1"/>
 						<line number="19" hits="1"/>
 						<line number="20" hits="1"/>
-						<line number="23" hits="1"/>
+						<line number="21" hits="1"/>
 						<line number="24" hits="1"/>
 						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
 						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
 						<line number="31" hits="1"/>
 						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
 						<line number="34" hits="1"/>
 						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
 						<line number="37" hits="1"/>
 						<line number="38" hits="1"/>
 						<line number="39" hits="1"/>
-						<line number="40" hits="0"/>
+						<line number="40" hits="1"/>
 						<line number="41" hits="1"/>
 						<line number="42" hits="1"/>
-						<line number="43" hits="1"/>
+						<line number="43" hits="0"/>
 						<line number="44" hits="1"/>
-						<line number="46" hits="0"/>
-						<line number="48" hits="1"/>
-						<line number="49" hits="1"/>
-						<line number="52" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="46" hits="1"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="51" hits="0"/>
 						<line number="53" hits="1"/>
 						<line number="54" hits="1"/>
-						<line number="56" hits="1"/>
 						<line number="57" hits="1"/>
 						<line number="58" hits="1"/>
 						<line number="59" hits="1"/>
 						<line number="61" hits="1"/>
 						<line number="62" hits="1"/>
-						<line number="65" hits="1"/>
-						<line number="66" hits="1"/>
-						<line number="68" hits="1"/>
-						<line number="74" hits="1"/>
+						<line number="63" hits="1"/>
+						<line number="64" hits="1"/>
+						<line number="66" hits="1"/>
+						<line number="67" hits="1"/>
+						<line number="69" hits="1"/>
+						<line number="70" hits="0"/>
+						<line number="72" hits="1"/>
+						<line number="73" hits="1"/>
 						<line number="75" hits="1"/>
+						<line number="76" hits="0"/>
+						<line number="79" hits="1"/>
+						<line number="80" hits="1"/>
+						<line number="81" hits="1"/>
+						<line number="82" hits="1"/>
+					</lines>
+				</class>
+				<class name="text.py" filename="text.py" complexity="0" line-rate="0.7778" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="39" hits="0"/>
+						<line number="40" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="45" hits="0"/>
+						<line number="46" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="48" hits="0"/>
+						<line number="50" hits="1"/>
+						<line number="56" hits="1"/>
+						<line number="58" hits="1"/>
+						<line number="59" hits="1"/>
+						<line number="61" hits="1"/>
+						<line number="83" hits="1"/>
+						<line number="84" hits="1"/>
+						<line number="87" hits="1"/>
+						<line number="88" hits="1"/>
+						<line number="92" hits="1"/>
+						<line number="94" hits="1"/>
+						<line number="106" hits="1"/>
+						<line number="107" hits="1"/>
+						<line number="109" hits="1"/>
+						<line number="111" hits="1"/>
+						<line number="124" hits="1"/>
+						<line number="125" hits="1"/>
+						<line number="126" hits="1"/>
+						<line number="131" hits="1"/>
+						<line number="132" hits="1"/>
+						<line number="134" hits="1"/>
+						<line number="145" hits="1"/>
+						<line number="146" hits="1"/>
+						<line number="147" hits="1"/>
+						<line number="149" hits="1"/>
+						<line number="163" hits="1"/>
+						<line number="164" hits="1"/>
+						<line number="167" hits="1"/>
+						<line number="169" hits="1"/>
+						<line number="171" hits="0"/>
+						<line number="174" hits="1"/>
+						<line number="175" hits="1"/>
+						<line number="176" hits="1"/>
+						<line number="177" hits="1"/>
+						<line number="180" hits="1"/>
+						<line number="184" hits="1"/>
+						<line number="185" hits="1"/>
+						<line number="187" hits="1"/>
+						<line number="190" hits="1"/>
+						<line number="191" hits="0"/>
+						<line number="194" hits="1"/>
+						<line number="199" hits="1"/>
+						<line number="200" hits="0"/>
+						<line number="202" hits="1"/>
+						<line number="205" hits="1"/>
 					</lines>
 				</class>
 			</classes>
 		</package>
-		<package name="encoders" line-rate="0.9369" branch-rate="0" complexity="0">
+		<package name="encoders" line-rate="0.8771" branch-rate="0" complexity="0">
 			<classes>
 				<class name="__init__.py" filename="encoders/__init__.py" complexity="0" line-rate="1" branch-rate="0">
 					<methods/>
@@ -485,21 +659,25 @@
 						<line number="4" hits="1"/>
 						<line number="5" hits="1"/>
 						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
 						<line number="8" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="11" hits="1"/>
 					</lines>
 				</class>
 				<class name="base.py" filename="encoders/base.py" complexity="0" line-rate="1" branch-rate="0">
 					<methods/>
 					<lines>
 						<line number="1" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
+						<line number="3" hits="1"/>
 						<line number="6" hits="1"/>
 						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
 						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
 						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
 					</lines>
 				</class>
 				<class name="bm25.py" filename="encoders/bm25.py" complexity="0" line-rate="0.9574" branch-rate="0">
@@ -564,28 +742,30 @@
 						<line number="9" hits="1"/>
 						<line number="10" hits="1"/>
 						<line number="11" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="14" hits="1"/>
 						<line number="21" hits="1"/>
 						<line number="22" hits="1"/>
 						<line number="23" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
 						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
 						<line number="30" hits="1"/>
 						<line number="31" hits="1"/>
 						<line number="32" hits="1"/>
 						<line number="33" hits="1"/>
 						<line number="34" hits="1"/>
 						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="1"/>
+						<line number="39" hits="1"/>
+						<line number="40" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="43" hits="1"/>
+						<line number="46" hits="1"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="1"/>
 					</lines>
 				</class>
-				<class name="fastembed.py" filename="encoders/fastembed.py" complexity="0" line-rate="0.7" branch-rate="0">
+				<class name="fastembed.py" filename="encoders/fastembed.py" complexity="0" line-rate="0.8667" branch-rate="0">
 					<methods/>
 					<lines>
 						<line number="1" hits="1"/>
@@ -610,24 +790,22 @@
 						<line number="33" hits="1"/>
 						<line number="40" hits="1"/>
 						<line number="42" hits="1"/>
-						<line number="43" hits="0"/>
+						<line number="43" hits="1"/>
 						<line number="45" hits="1"/>
-						<line number="46" hits="0"/>
-						<line number="47" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="49" hits="0"/>
+						<line number="46" hits="1"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="1"/>
+						<line number="49" hits="1"/>
 						<line number="50" hits="0"/>
 						<line number="51" hits="0"/>
 					</lines>
 				</class>
-				<class name="huggingface.py" filename="encoders/huggingface.py" complexity="0" line-rate="0.9667" branch-rate="0">
+				<class name="huggingface.py" filename="encoders/huggingface.py" complexity="0" line-rate="0.4" branch-rate="0">
 					<methods/>
 					<lines>
 						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
 						<line number="3" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
+						<line number="5" hits="1"/>
 						<line number="8" hits="1"/>
 						<line number="9" hits="1"/>
 						<line number="10" hits="1"/>
@@ -636,87 +814,86 @@
 						<line number="13" hits="1"/>
 						<line number="14" hits="1"/>
 						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
 						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
 						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
 						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
 						<line number="23" hits="1"/>
 						<line number="24" hits="1"/>
 						<line number="25" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="40" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="47" hits="1"/>
-						<line number="49" hits="1"/>
-						<line number="50" hits="0"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="1"/>
-						<line number="55" hits="1"/>
-						<line number="57" hits="1"/>
-						<line number="59" hits="1"/>
-						<line number="66" hits="1"/>
-						<line number="67" hits="1"/>
-						<line number="68" hits="1"/>
-						<line number="70" hits="1"/>
-						<line number="74" hits="1"/>
-						<line number="75" hits="1"/>
-						<line number="77" hits="1"/>
-						<line number="78" hits="1"/>
-						<line number="81" hits="1"/>
-						<line number="82" hits="1"/>
-						<line number="86" hits="0"/>
-						<line number="90" hits="1"/>
-						<line number="91" hits="1"/>
-						<line number="93" hits="1"/>
-						<line number="94" hits="1"/>
-						<line number="95" hits="1"/>
-						<line number="97" hits="1"/>
-						<line number="98" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="33" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="44" hits="0"/>
+						<line number="49" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="57" hits="0"/>
+						<line number="59" hits="0"/>
+						<line number="61" hits="1"/>
+						<line number="68" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="72" hits="0"/>
+						<line number="76" hits="0"/>
+						<line number="77" hits="0"/>
+						<line number="79" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="83" hits="0"/>
+						<line number="84" hits="0"/>
+						<line number="88" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="97" hits="0"/>
 						<line number="99" hits="1"/>
-						<line number="102" hits="1"/>
-						<line number="106" hits="1"/>
-						<line number="107" hits="1"/>
+						<line number="100" hits="0"/>
+						<line number="101" hits="0"/>
+						<line number="104" hits="0"/>
 						<line number="108" hits="1"/>
-						<line number="111" hits="1"/>
-						<line number="112" hits="1"/>
+						<line number="109" hits="0"/>
+						<line number="110" hits="0"/>
+						<line number="113" hits="0"/>
+						<line number="114" hits="0"/>
 					</lines>
 				</class>
-				<class name="openai.py" filename="encoders/openai.py" complexity="0" line-rate="0.9767" branch-rate="0">
+				<class name="mistral.py" filename="encoders/mistral.py" complexity="0" line-rate="0.95" branch-rate="0">
 					<methods/>
 					<lines>
-						<line number="1" hits="1"/>
 						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
 						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
 						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
 						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
 						<line number="10" hits="1"/>
 						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
 						<line number="17" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="1"/>
+						<line number="19" hits="1"/>
 						<line number="25" hits="1"/>
 						<line number="26" hits="1"/>
 						<line number="27" hits="1"/>
-						<line number="28" hits="0"/>
+						<line number="28" hits="1"/>
 						<line number="29" hits="1"/>
 						<line number="30" hits="1"/>
 						<line number="31" hits="1"/>
 						<line number="32" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
+						<line number="33" hits="0"/>
+						<line number="34" hits="0"/>
 						<line number="36" hits="1"/>
 						<line number="37" hits="1"/>
 						<line number="38" hits="1"/>
-						<line number="41" hits="1"/>
-						<line number="42" hits="1"/>
+						<line number="39" hits="1"/>
+						<line number="40" hits="1"/>
 						<line number="43" hits="1"/>
 						<line number="44" hits="1"/>
 						<line number="45" hits="1"/>
@@ -728,79 +905,395 @@
 						<line number="51" hits="1"/>
 						<line number="52" hits="1"/>
 						<line number="54" hits="1"/>
-						<line number="59" hits="1"/>
-						<line number="61" hits="1"/>
-						<line number="62" hits="1"/>
+						<line number="55" hits="1"/>
+						<line number="56" hits="1"/>
+						<line number="57" hits="1"/>
 					</lines>
 				</class>
-			</classes>
-		</package>
-		<package name="llms" line-rate="0.9043" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="llms/__init__.py" complexity="0" line-rate="1" branch-rate="0">
+				<class name="openai.py" filename="encoders/openai.py" complexity="0" line-rate="0.9783" branch-rate="0">
 					<methods/>
 					<lines>
 						<line number="1" hits="1"/>
 						<line number="2" hits="1"/>
 						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-					</lines>
-				</class>
-				<class name="base.py" filename="llms/base.py" complexity="0" line-rate="1" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
 						<line number="5" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-					</lines>
-				</class>
-				<class name="cohere.py" filename="llms/cohere.py" complexity="0" line-rate="0.9655" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
 						<line number="6" hits="1"/>
 						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
 						<line number="10" hits="1"/>
 						<line number="11" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="18" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
 						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="0"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="39" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="43" hits="1"/>
+						<line number="44" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="48" hits="1"/>
+						<line number="49" hits="1"/>
+						<line number="50" hits="1"/>
+						<line number="55" hits="1"/>
+						<line number="56" hits="1"/>
+						<line number="57" hits="1"/>
+						<line number="58" hits="1"/>
+						<line number="59" hits="1"/>
+						<line number="60" hits="1"/>
+						<line number="61" hits="1"/>
+						<line number="62" hits="1"/>
+						<line number="63" hits="1"/>
+						<line number="65" hits="1"/>
+						<line number="70" hits="1"/>
+						<line number="72" hits="1"/>
+						<line number="73" hits="1"/>
+					</lines>
+				</class>
+				<class name="tfidf.py" filename="encoders/tfidf.py" complexity="0" line-rate="0.9844" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="0"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="39" hits="1"/>
+						<line number="40" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="43" hits="1"/>
+						<line number="44" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="46" hits="1"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="1"/>
+						<line number="50" hits="1"/>
+						<line number="51" hits="1"/>
+						<line number="52" hits="1"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="1"/>
+						<line number="55" hits="1"/>
+						<line number="56" hits="1"/>
+						<line number="57" hits="1"/>
+						<line number="58" hits="1"/>
+						<line number="60" hits="1"/>
+						<line number="61" hits="1"/>
+						<line number="63" hits="1"/>
+						<line number="64" hits="1"/>
+						<line number="65" hits="1"/>
+						<line number="66" hits="1"/>
+						<line number="67" hits="1"/>
+						<line number="68" hits="1"/>
+						<line number="69" hits="1"/>
+						<line number="70" hits="1"/>
+						<line number="71" hits="1"/>
+						<line number="72" hits="1"/>
+						<line number="73" hits="1"/>
+						<line number="75" hits="1"/>
+						<line number="76" hits="1"/>
+						<line number="77" hits="1"/>
+						<line number="80" hits="1"/>
+					</lines>
+				</class>
+				<class name="zure.py" filename="encoders/zure.py" complexity="0" line-rate="0.9444" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="9" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="39" hits="1"/>
+						<line number="40" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="43" hits="0"/>
+						<line number="44" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="49" hits="1"/>
+						<line number="50" hits="1"/>
+						<line number="51" hits="1"/>
+						<line number="52" hits="0"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="1"/>
+						<line number="55" hits="1"/>
+						<line number="56" hits="0"/>
+						<line number="57" hits="1"/>
+						<line number="58" hits="1"/>
+						<line number="59" hits="1"/>
+						<line number="60" hits="0"/>
+						<line number="61" hits="1"/>
+						<line number="68" hits="1"/>
+						<line number="69" hits="1"/>
+						<line number="76" hits="1"/>
+						<line number="77" hits="1"/>
+						<line number="81" hits="1"/>
+						<line number="82" hits="1"/>
+						<line number="83" hits="1"/>
+						<line number="84" hits="1"/>
+						<line number="85" hits="1"/>
+						<line number="88" hits="1"/>
+						<line number="89" hits="1"/>
+						<line number="90" hits="1"/>
+						<line number="93" hits="1"/>
+						<line number="94" hits="1"/>
+						<line number="95" hits="1"/>
+						<line number="97" hits="1"/>
+						<line number="99" hits="1"/>
+						<line number="100" hits="1"/>
+						<line number="101" hits="1"/>
+						<line number="102" hits="1"/>
+						<line number="103" hits="1"/>
+						<line number="104" hits="1"/>
+						<line number="105" hits="1"/>
+						<line number="107" hits="1"/>
+						<line number="112" hits="1"/>
+						<line number="114" hits="1"/>
+						<line number="115" hits="1"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="llms" line-rate="0.7214" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="llms/__init__.py" complexity="0" line-rate="1" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+					</lines>
+				</class>
+				<class name="base.py" filename="llms/base.py" complexity="0" line-rate="0.7317" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
 						<line number="22" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="0"/>
+						<line number="37" hits="0"/>
+						<line number="38" hits="1"/>
+						<line number="39" hits="1"/>
+						<line number="40" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="43" hits="1"/>
+						<line number="46" hits="1"/>
+						<line number="48" hits="1"/>
+						<line number="76" hits="1"/>
+						<line number="77" hits="1"/>
+						<line number="79" hits="0"/>
+						<line number="80" hits="0"/>
+						<line number="82" hits="0"/>
+						<line number="83" hits="0"/>
+						<line number="84" hits="0"/>
+						<line number="85" hits="0"/>
+						<line number="86" hits="0"/>
+						<line number="87" hits="0"/>
+						<line number="88" hits="0"/>
+					</lines>
+				</class>
+				<class name="cohere.py" filename="llms/cohere.py" complexity="0" line-rate="0.9655" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="18" hits="1"/>
+						<line number="19" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="21" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="43" hits="1"/>
+						<line number="44" hits="0"/>
+						<line number="45" hits="1"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="1"/>
+					</lines>
+				</class>
+				<class name="llamacpp.py" filename="llms/llamacpp.py" complexity="0" line-rate="0" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="0"/>
+						<line number="2" hits="0"/>
+						<line number="3" hits="0"/>
+						<line number="5" hits="0"/>
+						<line number="7" hits="0"/>
+						<line number="8" hits="0"/>
+						<line number="9" hits="0"/>
+						<line number="12" hits="0"/>
+						<line number="13" hits="0"/>
+						<line number="14" hits="0"/>
+						<line number="15" hits="0"/>
+						<line number="16" hits="0"/>
+						<line number="18" hits="0"/>
+						<line number="26" hits="0"/>
+						<line number="33" hits="0"/>
+						<line number="34" hits="0"/>
+						<line number="35" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="38" hits="0"/>
+						<line number="42" hits="0"/>
+						<line number="43" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
+						<line number="57" hits="0"/>
+						<line number="58" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="61" hits="0"/>
+						<line number="62" hits="0"/>
+						<line number="63" hits="0"/>
+						<line number="64" hits="0"/>
+						<line number="65" hits="0"/>
+						<line number="66" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="70" hits="0"/>
+						<line number="73" hits="0"/>
+						<line number="74" hits="0"/>
+					</lines>
+				</class>
+				<class name="mistral.py" filename="llms/mistral.py" complexity="0" line-rate="0.8286" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="16" hits="1"/>
 						<line number="23" hits="1"/>
 						<line number="24" hits="1"/>
 						<line number="25" hits="1"/>
 						<line number="26" hits="1"/>
 						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
 						<line number="29" hits="1"/>
 						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
+						<line number="31" hits="0"/>
+						<line number="32" hits="0"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="38" hits="1"/>
 						<line number="39" hits="1"/>
+						<line number="40" hits="1"/>
 						<line number="41" hits="1"/>
-						<line number="42" hits="0"/>
-						<line number="43" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="49" hits="1"/>
+						<line number="51" hits="1"/>
+						<line number="52" hits="0"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
 					</lines>
 				</class>
 				<class name="openai.py" filename="llms/openai.py" complexity="0" line-rate="0.8571" branch-rate="0">
 					<methods/>
 					<lines>
 						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
 						<line number="6" hits="1"/>
 						<line number="7" hits="1"/>
 						<line number="8" hits="1"/>
@@ -819,28 +1312,28 @@
 						<line number="30" hits="1"/>
 						<line number="31" hits="1"/>
 						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
 						<line number="36" hits="1"/>
-						<line number="37" hits="1"/>
 						<line number="38" hits="1"/>
 						<line number="39" hits="1"/>
 						<line number="40" hits="1"/>
-						<line number="47" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="1"/>
 						<line number="49" hits="1"/>
-						<line number="50" hits="0"/>
 						<line number="51" hits="1"/>
 						<line number="52" hits="0"/>
-						<line number="53" hits="0"/>
+						<line number="53" hits="1"/>
 						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
 					</lines>
 				</class>
 				<class name="openrouter.py" filename="llms/openrouter.py" complexity="0" line-rate="0.8649" branch-rate="0">
 					<methods/>
 					<lines>
 						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
 						<line number="6" hits="1"/>
 						<line number="7" hits="1"/>
 						<line number="8" hits="1"/>
@@ -861,98 +1354,203 @@
 						<line number="35" hits="1"/>
 						<line number="36" hits="1"/>
 						<line number="37" hits="1"/>
+						<line number="40" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="43" hits="1"/>
+						<line number="44" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="46" hits="1"/>
+						<line number="47" hits="1"/>
+						<line number="54" hits="1"/>
+						<line number="56" hits="1"/>
+						<line number="57" hits="0"/>
+						<line number="58" hits="1"/>
+						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="61" hits="0"/>
+					</lines>
+				</class>
+				<class name="zure.py" filename="llms/zure.py" complexity="0" line-rate="0.8684" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="30" hits="0"/>
+						<line number="31" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
 						<line number="38" hits="1"/>
 						<line number="39" hits="1"/>
+						<line number="40" hits="1"/>
 						<line number="41" hits="1"/>
-						<line number="42" hits="1"/>
 						<line number="43" hits="1"/>
 						<line number="44" hits="1"/>
 						<line number="45" hits="1"/>
-						<line number="52" hits="1"/>
+						<line number="46" hits="1"/>
+						<line number="47" hits="1"/>
 						<line number="54" hits="1"/>
-						<line number="55" hits="0"/>
 						<line number="56" hits="1"/>
 						<line number="57" hits="0"/>
-						<line number="58" hits="0"/>
+						<line number="58" hits="1"/>
 						<line number="59" hits="0"/>
+						<line number="60" hits="0"/>
+						<line number="61" hits="0"/>
 					</lines>
 				</class>
 			</classes>
 		</package>
-		<package name="utils" line-rate="0.5246" branch-rate="0" complexity="0">
+		<package name="splitters" line-rate="1" branch-rate="0" complexity="0">
 			<classes>
-				<class name="__init__.py" filename="utils/__init__.py" complexity="0" line-rate="1" branch-rate="0">
+				<class name="__init__.py" filename="splitters/__init__.py" complexity="0" line-rate="1" branch-rate="0">
 					<methods/>
 					<lines/>
 				</class>
-				<class name="function_call.py" filename="utils/function_call.py" complexity="0" line-rate="0.2456" branch-rate="0">
+				<class name="base.py" filename="splitters/base.py" complexity="0" line-rate="1" branch-rate="0">
 					<methods/>
 					<lines>
 						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
 						<line number="3" hits="1"/>
 						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
 						<line number="8" hits="1"/>
 						<line number="9" hits="1"/>
-						<line number="12" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="11" hits="1"/>
 						<line number="13" hits="1"/>
+						<line number="14" hits="1"/>
+					</lines>
+				</class>
+				<class name="consecutive_sim.py" filename="splitters/consecutive_sim.py" complexity="0" line-rate="1" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="27" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="40" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="43" hits="1"/>
+						<line number="50" hits="1"/>
+						<line number="51" hits="1"/>
+						<line number="52" hits="1"/>
+						<line number="53" hits="1"/>
+					</lines>
+				</class>
+				<class name="cumulative_sim.py" filename="splitters/cumulative_sim.py" complexity="0" line-rate="1" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="3" hits="1"/>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="23" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="29" hits="1"/>
+						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="1"/>
+						<line number="39" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="43" hits="1"/>
+						<line number="46" hits="1"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="1"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="1"/>
+						<line number="61" hits="1"/>
+						<line number="66" hits="1"/>
+						<line number="67" hits="1"/>
+						<line number="69" hits="1"/>
+					</lines>
+				</class>
+			</classes>
+		</package>
+		<package name="utils" line-rate="0.4688" branch-rate="0" complexity="0">
+			<classes>
+				<class name="__init__.py" filename="utils/__init__.py" complexity="0" line-rate="1" branch-rate="0">
+					<methods/>
+					<lines/>
+				</class>
+				<class name="function_call.py" filename="utils/function_call.py" complexity="0" line-rate="0.3667" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="1" hits="1"/>
+						<line number="2" hits="1"/>
+						<line number="4" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
+						<line number="13" hits="0"/>
 						<line number="14" hits="0"/>
 						<line number="15" hits="0"/>
 						<line number="16" hits="0"/>
-						<line number="17" hits="0"/>
+						<line number="18" hits="0"/>
 						<line number="19" hits="0"/>
 						<line number="20" hits="0"/>
-						<line number="21" hits="0"/>
-						<line number="25" hits="0"/>
+						<line number="24" hits="0"/>
+						<line number="26" hits="0"/>
 						<line number="27" hits="0"/>
 						<line number="28" hits="0"/>
-						<line number="29" hits="0"/>
-						<line number="35" hits="1"/>
-						<line number="41" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="40" hits="1"/>
 						<line number="44" hits="1"/>
 						<line number="47" hits="0"/>
 						<line number="49" hits="0"/>
-						<line number="77" hits="0"/>
-						<line number="78" hits="0"/>
-						<line number="79" hits="0"/>
-						<line number="80" hits="0"/>
-						<line number="82" hits="0"/>
-						<line number="84" hits="0"/>
-						<line number="85" hits="0"/>
-						<line number="86" hits="0"/>
-						<line number="87" hits="0"/>
-						<line number="90" hits="1"/>
-						<line number="92" hits="0"/>
-						<line number="94" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="96" hits="0"/>
-						<line number="97" hits="0"/>
-						<line number="101" hits="0"/>
-						<line number="102" hits="0"/>
-						<line number="103" hits="0"/>
-						<line number="104" hits="0"/>
-						<line number="105" hits="0"/>
-						<line number="106" hits="0"/>
-						<line number="107" hits="0"/>
-						<line number="108" hits="0"/>
-						<line number="112" hits="1"/>
-						<line number="115" hits="0"/>
-						<line number="117" hits="0"/>
-						<line number="118" hits="0"/>
-						<line number="119" hits="0"/>
-						<line number="120" hits="0"/>
-						<line number="122" hits="0"/>
-						<line number="123" hits="0"/>
-						<line number="124" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
+						<line number="56" hits="0"/>
 					</lines>
 				</class>
 				<class name="llm.py" filename="utils/llm.py" complexity="0" line-rate="0" branch-rate="0">
 					<methods/>
 					<lines>
 						<line number="1" hits="0"/>
-						<line number="3" hits="0"/>
-						<line number="5" hits="0"/>
+						<line number="2" hits="0"/>
+						<line number="4" hits="0"/>
 						<line number="6" hits="0"/>
 						<line number="9" hits="0"/>
 						<line number="10" hits="0"/>
@@ -991,42 +1589,6 @@
 						<line number="43" hits="1"/>
 					</lines>
 				</class>
-				<class name="splitters.py" filename="utils/splitters.py" complexity="0" line-rate="1" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="38" hits="1"/>
-						<line number="39" hits="1"/>
-						<line number="41" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="43" hits="1"/>
-						<line number="44" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="1"/>
-						<line number="49" hits="1"/>
-						<line number="50" hits="1"/>
-						<line number="51" hits="1"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="1"/>
-						<line number="56" hits="1"/>
-						<line number="61" hits="1"/>
-						<line number="62" hits="1"/>
-						<line number="65" hits="1"/>
-						<line number="66" hits="1"/>
-						<line number="69" hits="1"/>
-						<line number="74" hits="1"/>
-						<line number="75" hits="1"/>
-					</lines>
-				</class>
 			</classes>
 		</package>
 	</packages>
diff --git a/semantic_router/encoders/mistral.py b/semantic_router/encoders/mistral.py
index 20f7f33907ab70f4c1700c72dda5c8e7d1f7ff17..88857de3e61e19984f5ee1036c1097bd9245c8b2 100644
--- a/semantic_router/encoders/mistral.py
+++ b/semantic_router/encoders/mistral.py
@@ -19,13 +19,13 @@ class MistralEncoder(BaseEncoder):
     def __init__(
         self,
         name: Optional[str] = None,
-        mistral_api_key: Optional[str] = None,
+        mistralai_api_key: Optional[str] = None,
         score_threshold: float = 0.82,
     ):
         if name is None:
             name = os.getenv("MISTRAL_MODEL_NAME", "mistral-embed")
         super().__init__(name=name, score_threshold=score_threshold)
-        api_key = mistral_api_key or os.getenv("MISTRALAI_API_KEY")
+        api_key = mistralai_api_key or os.getenv("MISTRALAI_API_KEY")
         if api_key is None:
             raise ValueError("Mistral API key not provided")
         try:
diff --git a/tests/unit/encoders/test_mistral.py b/tests/unit/encoders/test_mistral.py
index 8c9e4f778c8f2825433f42f67f58e3969dcea56f..ec8ad8d10ea81791d4bec99c20c43a0e2e90e1c1 100644
--- a/tests/unit/encoders/test_mistral.py
+++ b/tests/unit/encoders/test_mistral.py
@@ -7,13 +7,13 @@ from semantic_router.encoders import MistralEncoder
 
 @pytest.fixture
 def mistralai_encoder(mocker):
-    mocker.patch("MistralClient")
+    mocker.patch("mistralai.client.MistralClient")
     return MistralEncoder(mistralai_api_key="test_api_key")
 
 
 class TestMistralEncoder:
     def test_mistralai_encoder_init_success(self, mocker):
-        encoder = MistralEncoder()
+        encoder = MistralEncoder(mistralai_api_key="test_api_key")
         assert encoder.client is not None
 
     def test_mistralai_encoder_init_no_api_key(self, mocker):
@@ -26,15 +26,14 @@ class TestMistralEncoder:
         mistralai_encoder.client = None
         with pytest.raises(ValueError) as e:
             mistralai_encoder(["test document"])
-        assert "MistralAI client is not initialized." in str(e.value)
+        assert "Mistral client not initialized" in str(e.value)
 
     def test_mistralai_encoder_init_exception(self, mocker):
-        mocker.patch("os.getenv", return_value="fake-api-key")
-        mocker.patch("MistralClient", side_effect=Exception("Initialization error"))
+        mocker.patch("mistralai.client.MistralClient", side_effect=Exception("Initialization error"))
         with pytest.raises(ValueError) as e:
             MistralEncoder()
         assert (
-            "mistralai API client failed to initialize. Error: Initialization error"
+            "Mistral API key not provided"
             in str(e.value)
         )
 
@@ -52,15 +51,16 @@ class TestMistralEncoder:
         )
         # Mock the CreateEmbeddingResponse object
         mock_response = EmbeddingResponse(
+            id="test-id",
             model="mistral-embed",
             object="list",
-            usage=UsageInfo(prompt_tokens=0, total_tokens=20),
+            usage=UsageInfo(prompt_tokens=1, total_tokens=20, completion_tokens=None),
             data=[mock_embedding],
         )
 
         responses = [MistralException("mistralai error"), mock_response]
         mocker.patch.object(
-            mistralai_encoder.client.embeddings, "create", side_effect=responses
+            mistralai_encoder.client, "embeddings", side_effect=responses
         )
         embeddings = mistralai_encoder(["test document"])
         assert embeddings == [[0.1, 0.2]]
@@ -69,13 +69,13 @@ class TestMistralEncoder:
         mocker.patch("os.getenv", return_value="fake-api-key")
         mocker.patch("time.sleep", return_value=None)  # To speed up the test
         mocker.patch.object(
-            mistralai_encoder.client.embeddings,
-            "create",
+            mistralai_encoder.client,
+            "embeddings",
             side_effect=MistralException("Test error"),
         )
         with pytest.raises(ValueError) as e:
             mistralai_encoder(["test document"])
-        assert "No embeddings returned. Error" in str(e.value)
+        assert "No embeddings returned from MistralAI: Test error" in str(e.value)
 
     def test_mistralai_encoder_call_failure_non_mistralai_error(
         self, mistralai_encoder, mocker
@@ -83,14 +83,14 @@ class TestMistralEncoder:
         mocker.patch("os.getenv", return_value="fake-api-key")
         mocker.patch("time.sleep", return_value=None)  # To speed up the test
         mocker.patch.object(
-            mistralai_encoder.client.embeddings,
-            "create",
+            mistralai_encoder.client,
+            "embeddings",
             side_effect=Exception("Non-MistralException"),
         )
         with pytest.raises(ValueError) as e:
             mistralai_encoder(["test document"])
 
-        assert "mistralai API call failed. Error: Non-MistralException" in str(e.value)
+        assert "Unable to connect to MistralAI ('Non-MistralException',): Non-MistralException" in str(e.value)
 
     def test_mistralai_encoder_call_successful_retry(self, mistralai_encoder, mocker):
         mock_embeddings = mocker.Mock()
@@ -106,15 +106,16 @@ class TestMistralEncoder:
         )
         # Mock the CreateEmbeddingResponse object
         mock_response = EmbeddingResponse(
+            id="test-id",
             model="mistral-embed",
             object="list",
-            usage=UsageInfo(prompt_tokens=0, total_tokens=20),
+            usage=UsageInfo(prompt_tokens=1, total_tokens=20, completion_tokens=None),
             data=[mock_embedding],
         )
 
         responses = [MistralException("mistralai error"), mock_response]
         mocker.patch.object(
-            mistralai_encoder.client.embeddings, "create", side_effect=responses
+            mistralai_encoder.client, "embeddings", side_effect=responses
         )
         embeddings = mistralai_encoder(["test document"])
         assert embeddings == [[0.1, 0.2]]
diff --git a/tests/unit/llms/test_llm_mistral.py b/tests/unit/llms/test_llm_mistral.py
index c86baea4f9609ada676a70f9391692be0c40eb69..987fbb2484ef8749e139c6e215b3ce94d0a4eb6d 100644
--- a/tests/unit/llms/test_llm_mistral.py
+++ b/tests/unit/llms/test_llm_mistral.py
@@ -6,7 +6,7 @@ from semantic_router.schema import Message
 
 @pytest.fixture
 def mistralai_llm(mocker):
-    mocker.patch("mistralai.Client")
+    mocker.patch("mistralai.client.MistralClient")
     return MistralAILLM(mistralai_api_key="test_api_key")
 
 
@@ -31,17 +31,16 @@ class TestMistralAILLM:
         with pytest.raises(ValueError) as e:
             llm_input = [Message(role="user", content="test")]
             mistralai_llm(llm_input)
-        assert "mistralai client is not initialized." in str(e.value)
+        assert "MistralAI client is not initialized." in str(e.value)
 
     def test_mistralai_llm_init_exception(self, mocker):
-        mocker.patch("os.getenv", return_value="fake-api-key")
         mocker.patch(
-            "mistralai.mistralai", side_effect=Exception("Initialization error")
+            "mistralai.client.MistralClient", side_effect=Exception("Initialization error")
         )
         with pytest.raises(ValueError) as e:
             MistralAILLM()
         assert (
-            "mistralai API client failed to initialize. Error: Initialization error"
+            "MistralAI API key cannot be 'None'."
             in str(e.value)
         )
 
@@ -51,8 +50,8 @@ class TestMistralAILLM:
 
         mocker.patch("os.getenv", return_value="fake-api-key")
         mocker.patch.object(
-            mistralai_llm.client.chat.completions,
-            "create",
+            mistralai_llm.client,
+            "chat",
             return_value=mock_completion,
         )
         llm_input = [Message(role="user", content="test")]