diff --git a/.github/workflows/conventional_commits.yml b/.github/workflows/conventional_commits.yml new file mode 100644 index 0000000000000000000000000000000000000000..9778b0186ada4e84e76d39f6d83eb9f4af822e9b --- /dev/null +++ b/.github/workflows/conventional_commits.yml @@ -0,0 +1,13 @@ +name: Conventional Commits + +on: + pull_request: + branches: [main] + +jobs: + build: + name: Conventional Commits + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: webiny/action-conventional-commits@v1.1.0 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index b7c6e679c2f89003a14023fbd12afc30f8b7c5db..dcd301e5d631cab642bd45c813ddc8d86e86f7a4 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -37,4 +37,4 @@ jobs: poetry install - name: Analyzing the code with our lint run: | - make lint \ No newline at end of file + make lint diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 43af57e5ed2e38785c50adbd36cbf70afd300b36..530abf4e8f6dfa6d0d8b84e29033848f5b6def88 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,11 @@ default_language_version: python: python3.11.3 repos: + - repo: meta + hooks: + - id: check-hooks-apply + - id: check-useless-excludes + - repo: https://github.com/psf/black rev: 23.9.1 hooks: @@ -21,10 +26,38 @@ repos: - id: ruff-format types_or: [ python, pyi, jupyter ] + - repo: https://github.com/codespell-project/codespell + rev: v2.2.4 + hooks: + - id: codespell + name: Run codespell to check for common misspellings in files + language: python + types: [ text ] + args: [ "--write-changes", "--ignore-words-list", "asend" ] + exclude: "poetry.lock" + - repo: https://github.com/pre-commit/pre-commit-hooks rev: v4.4.0 hooks: - - id: trailing-whitespace + - id: check-vcs-permalinks - id: end-of-file-fixer + # exclude: "tests/((commands|data)/|test_).+" + - id: trailing-whitespace + args: [ --markdown-linebreak-ext=md ] + - id: debug-statements + - id: no-commit-to-branch + - id: check-merge-conflict + - id: check-toml - id: check-yaml + args: [ '--unsafe' ] # for mkdocs.yml + - id: detect-private-key + + - repo: https://github.com/commitizen-tools/commitizen + rev: v3.13.0 + hooks: + - id: commitizen + - id: commitizen-branch + stages: + - post-commit + - push diff --git a/coverage.xml b/coverage.xml index 27e175c33ef0897bd44b76a15c97bbb33f9afecc..f4b8af22c04a918a523a8dc7cacbf5edefab3d47 100644 --- a/coverage.xml +++ b/coverage.xml @@ -1,12 +1,12 @@ <?xml version="1.0" ?> -<coverage version="7.3.3" timestamp="1703085147401" lines-valid="544" lines-covered="470" line-rate="0.864" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0"> +<coverage version="7.3.3" timestamp="1704188881490" lines-valid="608" lines-covered="411" line-rate="0.676" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0"> <!-- Generated by coverage.py: https://coverage.readthedocs.io/en/7.3.3 --> <!-- 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> </sources> <packages> - <package name="." line-rate="0.9527" branch-rate="0" complexity="0"> + <package name="." line-rate="0.7045" branch-rate="0" complexity="0"> <classes> <class name="__init__.py" filename="__init__.py" complexity="0" line-rate="1" branch-rate="0"> <methods/> @@ -17,7 +17,7 @@ <line number="5" hits="1"/> </lines> </class> - <class name="hybrid_layer.py" filename="hybrid_layer.py" complexity="0" line-rate="1" branch-rate="0"> + <class name="hybrid_layer.py" filename="hybrid_layer.py" complexity="0" line-rate="0.2143" branch-rate="0"> <methods/> <lines> <line number="1" hits="1"/> @@ -25,185 +25,289 @@ <line number="4" 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="22" hits="1"/> - <line number="25" hits="1"/> - <line number="26" hits="1"/> - <line number="27" 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="36" 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="46" hits="1"/> - <line number="48" hits="1"/> - <line number="50" hits="1"/> - <line number="51" hits="1"/> - <line number="53" hits="1"/> - <line number="55" hits="1"/> - <line number="56" hits="1"/> - <line number="61" hits="1"/> - <line number="62" hits="1"/> - <line number="63" hits="1"/> - <line number="65" hits="1"/> - <line number="66" hits="1"/> - <line number="67" hits="1"/> - <line number="71" hits="1"/> - <line number="72" hits="1"/> - <line number="74" hits="1"/> - <line number="76" hits="1"/> - <line number="77" hits="1"/> - <line number="79" hits="1"/> - <line number="81" hits="1"/> - <line number="86" hits="1"/> - <line number="87" hits="1"/> - <line number="89" hits="1"/> - <line number="90" hits="1"/> - <line number="92" hits="1"/> - <line number="94" hits="1"/> - <line number="96" hits="1"/> - <line number="97" hits="1"/> - <line number="98" hits="1"/> - <line number="100" hits="1"/> - <line number="101" hits="1"/> - <line number="102" hits="1"/> - <line number="103" hits="1"/> - <line number="105" hits="1"/> - <line number="106" hits="1"/> - <line number="107" hits="1"/> - <line number="109" hits="1"/> - <line number="110" hits="1"/> + <line number="23" hits="1"/> + <line number="24" hits="1"/> + <line number="25" hits="0"/> + <line number="27" hits="0"/> + <line number="28" hits="0"/> + <line number="29" hits="0"/> + <line number="30" hits="0"/> + <line number="32" hits="0"/> + <line number="34" hits="0"/> + <line number="38" hits="0"/> + <line number="40" hits="1"/> + <line number="41" hits="0"/> + <line number="42" hits="0"/> + <line number="43" hits="0"/> + <line number="44" hits="0"/> + <line number="45" hits="0"/> + <line number="47" hits="0"/> + <line number="49" hits="1"/> + <line number="50" hits="0"/> + <line number="52" hits="1"/> + <line number="54" hits="0"/> + <line number="55" hits="0"/> + <line number="60" hits="0"/> + <line number="61" hits="0"/> + <line number="62" hits="0"/> + <line number="64" hits="0"/> + <line number="65" hits="0"/> + <line number="66" hits="0"/> + <line number="70" hits="0"/> + <line number="71" hits="0"/> + <line number="73" hits="0"/> + <line number="75" hits="0"/> + <line number="76" hits="0"/> + <line number="78" hits="0"/> + <line number="80" hits="1"/> + <line number="82" hits="0"/> + <line number="83" hits="0"/> + <line number="86" hits="0"/> + <line number="87" hits="0"/> + <line number="90" hits="0"/> + <line number="91" hits="0"/> + <line number="92" hits="0"/> + <line number="99" hits="0"/> + <line number="106" hits="0"/> <line number="112" hits="1"/> - <line number="113" hits="1"/> - <line number="115" hits="1"/> - <line number="117" hits="1"/> - <line number="118" hits="1"/> - <line number="119" hits="1"/> - <line number="121" hits="1"/> - <line number="123" hits="1"/> - <line number="125" hits="1"/> - <line number="126" hits="1"/> - <line number="127" hits="1"/> - <line number="129" hits="1"/> - <line number="132" hits="1"/> - <line number="133" hits="1"/> - <line number="136" hits="1"/> - <line number="137" hits="1"/> - <line number="139" hits="1"/> - <line number="140" hits="1"/> - <line number="142" hits="1"/> - <line number="143" hits="1"/> - <line number="144" hits="1"/> + <line number="117" hits="0"/> + <line number="118" hits="0"/> + <line number="120" hits="0"/> + <line number="121" hits="0"/> + <line number="123" hits="0"/> + <line number="125" hits="0"/> + <line number="127" hits="0"/> + <line number="128" hits="0"/> + <line number="129" hits="0"/> + <line number="131" hits="0"/> + <line number="132" hits="0"/> + <line number="133" hits="0"/> + <line number="134" hits="0"/> + <line number="136" hits="0"/> + <line number="137" hits="0"/> + <line number="138" hits="0"/> + <line number="140" hits="0"/> + <line number="141" hits="0"/> + <line number="143" hits="0"/> + <line number="144" hits="0"/> <line number="146" hits="1"/> + <line number="148" hits="0"/> + <line number="149" hits="0"/> + <line number="150" hits="0"/> + <line number="152" hits="1"/> + <line number="153" hits="0"/> + <line number="154" hits="0"/> + <line number="155" hits="0"/> + <line number="156" hits="0"/> + <line number="157" hits="0"/> + <line number="158" hits="0"/> + <line number="160" hits="0"/> + <line number="163" hits="0"/> + <line number="164" hits="0"/> + <line number="167" hits="0"/> + <line number="168" hits="0"/> + <line number="170" hits="0"/> + <line number="171" hits="0"/> + <line number="173" hits="1"/> + <line number="174" hits="0"/> + <line number="175" hits="0"/> + <line number="177" hits="0"/> </lines> </class> - <class name="layer.py" filename="layer.py" complexity="0" line-rate="0.8791" branch-rate="0"> + <class name="layer.py" filename="layer.py" complexity="0" line-rate="0.8541" 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="11" hits="1"/> + <line number="5" hits="1"/> + <line number="7" hits="1"/> <line number="12" hits="1"/> + <line number="13" hits="1"/> <line number="14" hits="1"/> - <line number="17" hits="1"/> + <line number="15" hits="1"/> <line number="18" hits="1"/> <line number="19" hits="1"/> <line number="20" hits="1"/> - <line number="22" hits="1"/> + <line number="21" hits="1"/> <line number="23" hits="1"/> - <line number="24" hits="1"/> - <line number="25" hits="1"/> - <line number="27" hits="1"/> - <line number="28" hits="1"/> - <line number="29" hits="1"/> - <line number="30" hits="1"/> - <line number="32" hits="1"/> + <line number="24" hits="0"/> + <line number="25" hits="0"/> + <line number="26" hits="0"/> + <line number="27" hits="0"/> + <line number="30" hits="0"/> + <line number="31" hits="0"/> + <line number="33" hits="1"/> <line number="34" hits="1"/> - <line number="36" hits="1"/> - <line number="38" hits="1"/> - <line number="39" hits="1"/> + <line number="35" hits="0"/> + <line number="38" hits="0"/> <line number="40" hits="1"/> - <line number="41" hits="1"/> - <line number="42" hits="1"/> - <line number="43" hits="1"/> - <line number="45" hits="1"/> - <line number="47" hits="1"/> - <line number="48" hits="1"/> - <line number="49" hits="0"/> - <line number="50" hits="0"/> - <line number="51" hits="0"/> - <line number="52" hits="0"/> + <line number="41" hits="0"/> + <line number="42" hits="0"/> + <line number="43" hits="0"/> + <line number="46" hits="1"/> + <line number="52" hits="1"/> <line number="54" hits="1"/> - <line number="55" hits="1"/> - <line number="56" hits="0"/> - <line number="57" hits="0"/> - <line number="58" hits="0"/> - <line number="59" hits="0"/> + <line number="60" hits="1"/> <line number="61" hits="1"/> <line number="63" hits="1"/> - <line number="66" 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="1"/> - <line number="72" hits="1"/> + <line number="71" hits="1"/> <line number="73" hits="1"/> - <line number="75" hits="1"/> + <line number="74" hits="1"/> <line number="76" hits="1"/> + <line number="77" hits="1"/> <line number="78" hits="1"/> + <line number="79" hits="1"/> <line number="80" hits="1"/> - <line number="83" hits="1"/> - <line number="86" hits="1"/> - <line number="87" hits="1"/> + <line number="81" hits="1"/> + <line number="82" hits="1"/> + <line number="84" hits="1"/> <line number="88" hits="1"/> - <line number="95" hits="1"/> - <line number="96" hits="1"/> - <line number="102" hits="1"/> - <line number="107" hits="1"/> + <line number="89" hits="1"/> + <line number="90" hits="1"/> + <line number="91" hits="1"/> + <line number="92" hits="1"/> + <line number="93" hits="1"/> + <line number="97" hits="0"/> + <line number="99" hits="1"/> + <line number="100" hits="1"/> + <line number="106" hits="1"/> <line number="108" hits="1"/> + <line number="109" hits="1"/> <line number="110" hits="1"/> + <line number="111" hits="1"/> <line number="112" hits="1"/> <line number="113" hits="1"/> - <line number="115" hits="1"/> + <line number="114" hits="1"/> <line number="116" hits="1"/> - <line number="118" hits="1"/> - <line number="119" hits="1"/> - <line number="121" hits="1"/> - <line number="122" hits="1"/> - <line number="123" hits="1"/> + <line number="120" hits="1"/> + <line number="121" hits="0"/> + <line number="122" hits="0"/> <line number="124" hits="1"/> - <line number="125" hits="1"/> - <line number="126" hits="1"/> - <line number="127" hits="1"/> - <line number="129" hits="1"/> - <line number="132" hits="1"/> - <line number="133" hits="1"/> - <line number="136" hits="1"/> - <line number="137" hits="1"/> + <line number="125" hits="0"/> + <line number="126" hits="0"/> + <line number="127" hits="0"/> + <line number="128" hits="0"/> + <line number="129" hits="0"/> + <line number="131" hits="1"/> + <line number="132" hits="0"/> + <line number="133" hits="0"/> + <line number="135" hits="0"/> + <line number="136" hits="0"/> <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="1"/> - <line number="146" hits="1"/> + <line number="147" hits="1"/> <line number="148" hits="1"/> - <line number="149" hits="0"/> - <line number="150" hits="0"/> - <line number="151" hits="0"/> + <line number="149" hits="1"/> + <line number="150" hits="1"/> + <line number="151" hits="1"/> + <line number="153" hits="1"/> + <line number="154" hits="1"/> + <line number="155" hits="1"/> + <line number="156" hits="1"/> + <line number="158" hits="1"/> + <line number="160" 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="170" hits="1"/> + <line number="171" hits="1"/> + <line number="174" hits="1"/> + <line number="176" hits="1"/> + <line number="177" hits="0"/> + <line number="183" hits="1"/> + <line number="184" hits="1"/> + <line number="185" hits="1"/> + <line number="186" hits="1"/> + <line number="187" hits="1"/> + <line number="189" hits="1"/> + <line number="190" hits="1"/> + <line number="191" hits="1"/> + <line number="192" hits="1"/> + <line number="193" hits="1"/> + <line number="195" hits="1"/> + <line number="196" hits="1"/> + <line number="197" hits="1"/> + <line number="198" hits="1"/> + <line number="200" hits="1"/> + <line number="201" hits="1"/> + <line number="203" hits="1"/> + <line number="206" hits="1"/> + <line number="207" hits="1"/> + <line number="208" hits="1"/> + <line number="210" hits="1"/> + <line number="211" hits="1"/> + <line number="212" hits="1"/> + <line number="214" hits="1"/> + <line number="215" hits="1"/> + <line number="216" hits="1"/> + <line number="218" hits="1"/> + <line number="219" hits="1"/> + <line number="220" hits="1"/> + <line number="222" hits="1"/> + <line number="224" hits="1"/> + <line number="226" hits="1"/> + <line number="229" hits="1"/> + <line number="232" hits="1"/> + <line number="233" hits="1"/> + <line number="234" hits="1"/> + <line number="241" hits="1"/> + <line number="242" hits="1"/> + <line number="248" hits="1"/> + <line number="253" hits="1"/> + <line number="254" hits="1"/> + <line number="256" hits="1"/> + <line number="258" hits="1"/> + <line number="259" hits="1"/> + <line number="261" hits="1"/> + <line number="262" hits="1"/> + <line number="264" hits="1"/> + <line number="265" hits="1"/> + <line number="267" hits="1"/> + <line number="268" hits="1"/> + <line number="269" hits="1"/> + <line number="270" hits="1"/> + <line number="271" hits="1"/> + <line number="272" hits="1"/> + <line number="273" hits="1"/> + <line number="275" hits="1"/> + <line number="278" hits="1"/> + <line number="279" hits="1"/> + <line number="282" hits="1"/> + <line number="283" hits="1"/> + <line number="285" hits="1"/> + <line number="286" hits="1"/> + <line number="288" hits="1"/> + <line number="289" hits="1"/> + <line number="290" hits="1"/> + <line number="292" hits="1"/> + <line number="294" hits="1"/> + <line number="295" hits="1"/> + <line number="301" hits="1"/> + <line number="302" hits="1"/> + <line number="303" hits="1"/> + <line number="305" hits="1"/> + <line number="306" hits="1"/> + <line number="307" hits="1"/> </lines> </class> <class name="linear.py" filename="linear.py" complexity="0" line-rate="1" branch-rate="0"> @@ -224,123 +328,85 @@ <line number="30" hits="1"/> </lines> </class> - <class name="route.py" filename="route.py" complexity="0" line-rate="0.9528" branch-rate="0"> + <class name="route.py" filename="route.py" complexity="0" line-rate="0.8529" 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"/> + <line number="5" 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="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="22" hits="0"/> + <line number="25" hits="0"/> <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="36" hits="1"/> - <line number="37" hits="1"/> - <line number="38" hits="1"/> - <line number="39" hits="1"/> + <line number="33" hits="1"/> + <line number="35" hits="1"/> + <line number="36" hits="0"/> + <line number="37" hits="0"/> + <line number="38" hits="0"/> + <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="50" hits="1"/> - <line number="51" hits="1"/> - <line number="52" hits="1"/> - <line number="54" hits="1"/> - <line number="55" hits="1"/> + <line number="50" hits="0"/> + <line number="53" hits="0"/> + <line number="56" hits="1"/> + <line number="57" 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="64" hits="1"/> <line number="66" hits="1"/> <line number="67" hits="1"/> - <line number="69" hits="1"/> - <line number="70" hits="1"/> <line number="71" hits="1"/> - <line number="73" hits="0"/> + <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="78" hits="1"/> <line number="79" hits="1"/> - <line number="104" hits="1"/> - <line number="105" hits="1"/> - <line number="106" hits="0"/> - <line number="108" hits="1"/> - <line number="110" hits="1"/> - <line number="112" hits="1"/> - <line number="113" hits="1"/> - <line number="114" hits="0"/> + <line number="81" hits="1"/> + <line number="82" hits="1"/> + <line number="83" hits="1"/> + <line number="85" hits="0"/> + <line number="87" hits="1"/> + <line number="88" hits="1"/> + <line number="89" hits="1"/> + <line number="91" hits="1"/> + <line number="116" hits="1"/> <line number="117" hits="1"/> + <line number="118" hits="0"/> + <line number="120" hits="1"/> <line number="122" hits="1"/> <line number="124" hits="1"/> <line number="125" hits="1"/> - <line number="127" hits="1"/> - <line number="128" 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="138" hits="1"/> - <line number="142" hits="1"/> - <line number="143" hits="1"/> - <line number="144" hits="1"/> - <line number="145" hits="1"/> - <line number="147" hits="0"/> - <line number="149" hits="1"/> - <line number="150" hits="1"/> - <line number="152" hits="1"/> - <line number="154" 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="162" hits="1"/> - <line number="166" hits="1"/> - <line number="167" hits="1"/> - <line number="168" hits="1"/> - <line number="170" hits="1"/> - <line number="171" hits="1"/> - <line number="172" hits="1"/> - <line number="173" hits="1"/> - <line number="174" hits="1"/> - <line number="175" hits="1"/> - <line number="177" hits="1"/> - <line number="178" hits="1"/> - <line number="179" hits="0"/> - <line number="181" hits="1"/> - <line number="182" hits="1"/> + <line number="126" hits="0"/> </lines> </class> - <class name="schema.py" filename="schema.py" complexity="0" line-rate="1" 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="5" hits="1"/> + <line number="4" hits="1"/> <line number="6" hits="1"/> <line number="13" hits="1"/> <line number="14" hits="1"/> @@ -349,34 +415,28 @@ <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="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="39" hits="1"/> - <line number="40" hits="1"/> - <line number="41" hits="1"/> + <line number="37" hits="0"/> + <line number="38" hits="0"/> + <line number="40" hits="0"/> <line number="42" hits="1"/> <line number="43" hits="1"/> - <line number="45" hits="1"/> - <line number="46" hits="1"/> - <line number="47" hits="1"/> - <line number="49" hits="1"/> - <line number="50" hits="1"/> </lines> </class> </classes> </package> - <package name="encoders" line-rate="1" branch-rate="0" complexity="0"> + <package name="encoders" line-rate="0.812" branch-rate="0" complexity="0"> <classes> <class name="__init__.py" filename="encoders/__init__.py" complexity="0" line-rate="1" branch-rate="0"> <methods/> @@ -394,13 +454,14 @@ <line number="1" hits="1"/> <line number="4" hits="1"/> <line number="5" hits="1"/> - <line number="7" hits="1"/> + <line number="6" hits="1"/> <line number="8" hits="1"/> - <line number="10" hits="1"/> + <line number="9" hits="1"/> <line number="11" hits="1"/> + <line number="12" hits="1"/> </lines> </class> - <class name="bm25.py" filename="encoders/bm25.py" complexity="0" line-rate="1" branch-rate="0"> + <class name="bm25.py" filename="encoders/bm25.py" complexity="0" line-rate="0.4865" branch-rate="0"> <methods/> <lines> <line number="1" hits="1"/> @@ -409,39 +470,40 @@ <line number="8" hits="1"/> <line number="9" hits="1"/> <line number="10" hits="1"/> - <line number="12" hits="1"/> + <line number="11" hits="1"/> <line number="13" hits="1"/> <line number="14" hits="1"/> - <line number="16" hits="1"/> + <line number="15" 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="24" hits="1"/> + <line number="21" 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="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="41" hits="1"/> - <line number="42" hits="1"/> - <line number="44" hits="1"/> + <line number="26" hits="0"/> + <line number="27" hits="0"/> + <line number="28" hits="0"/> + <line number="29" hits="0"/> + <line number="30" hits="0"/> + <line number="31" hits="0"/> + <line number="33" hits="0"/> + <line number="35" hits="0"/> + <line number="36" hits="0"/> + <line number="37" hits="0"/> + <line number="38" 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="1"/> - <line number="46" hits="1"/> - <line number="47" hits="1"/> + <line number="46" hits="0"/> + <line number="47" hits="0"/> + <line number="48" hits="0"/> </lines> </class> - <class name="cohere.py" filename="encoders/cohere.py" complexity="0" line-rate="1" branch-rate="0"> + <class name="cohere.py" filename="encoders/cohere.py" complexity="0" line-rate="0.92" branch-rate="0"> <methods/> <lines> <line number="1" hits="1"/> @@ -449,8 +511,8 @@ <line number="5" hits="1"/> <line number="8" hits="1"/> <line number="9" hits="1"/> - <line number="11" hits="1"/> - <line number="16" hits="1"/> + <line number="10" hits="1"/> + <line number="12" hits="1"/> <line number="17" hits="1"/> <line number="18" hits="1"/> <line number="19" hits="1"/> @@ -458,17 +520,20 @@ <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="24" hits="1"/> + <line number="25" hits="0"/> + <line number="26" 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="33" hits="1"/> + <line number="34" hits="1"/> + <line number="35" hits="1"/> </lines> </class> - <class name="openai.py" filename="encoders/openai.py" complexity="0" line-rate="1" branch-rate="0"> + <class name="openai.py" filename="encoders/openai.py" complexity="0" line-rate="0.9762" branch-rate="0"> <methods/> <lines> <line number="1" hits="1"/> @@ -480,23 +545,23 @@ <line number="9" hits="1"/> <line number="12" hits="1"/> <line number="13" hits="1"/> - <line number="15" hits="1"/> - <line number="20" hits="1"/> + <line number="14" hits="1"/> + <line number="16" 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="26" hits="0"/> <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="1"/> <line number="41" hits="1"/> @@ -507,15 +572,17 @@ <line number="46" hits="1"/> <line number="47" hits="1"/> <line number="48" hits="1"/> + <line number="49" hits="1"/> <line number="50" hits="1"/> - <line number="55" hits="1"/> + <line number="52" hits="1"/> <line number="57" hits="1"/> - <line number="58" hits="1"/> + <line number="59" hits="1"/> + <line number="60" hits="1"/> </lines> </class> </classes> </package> - <package name="utils" line-rate="0.3958" branch-rate="0" complexity="0"> + <package name="utils" line-rate="0.3895" branch-rate="0" complexity="0"> <classes> <class name="__init__.py" filename="utils/__init__.py" complexity="0" line-rate="1" branch-rate="0"> <methods/> diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh new file mode 100755 index 0000000000000000000000000000000000000000..c8609f29a267e83cc0c42df3a9c424d5186de7b0 --- /dev/null +++ b/scripts/run_tests.sh @@ -0,0 +1,3 @@ +#!/bin/bash +poetry install +make test diff --git a/semantic_router/__init__.py b/semantic_router/__init__.py index 07735312c6cd8a682726373dcf20fa000a020c13..1c604af8065f9b2e1519e6f92daf7af2739d584b 100644 --- a/semantic_router/__init__.py +++ b/semantic_router/__init__.py @@ -1,5 +1,5 @@ from semantic_router.hybrid_layer import HybridRouteLayer -from semantic_router.layer import RouteLayer, LayerConfig +from semantic_router.layer import LayerConfig, RouteLayer from semantic_router.route import Route __all__ = ["RouteLayer", "HybridRouteLayer", "Route", "LayerConfig"] diff --git a/semantic_router/hybrid_layer.py b/semantic_router/hybrid_layer.py index 22f6573c8d5d88b1ac083628075a9fed3ec28037..fc63cfa6ec2dc618849ffb54c0a49b88288470dd 100644 --- a/semantic_router/hybrid_layer.py +++ b/semantic_router/hybrid_layer.py @@ -7,9 +7,8 @@ from semantic_router.encoders import ( CohereEncoder, OpenAIEncoder, ) -from semantic_router.utils.logger import logger - from semantic_router.route import Route +from semantic_router.utils.logger import logger class HybridRouteLayer: diff --git a/semantic_router/layer.py b/semantic_router/layer.py index dae040a5d7537f0f22f0c7edeeb035f58e7eb0fb..5b2aad846ad8531fbeb02504f42e1688b22ceebc 100644 --- a/semantic_router/layer.py +++ b/semantic_router/layer.py @@ -10,10 +10,9 @@ from semantic_router.encoders import ( OpenAIEncoder, ) from semantic_router.linear import similarity_matrix, top_scores -from semantic_router.utils.logger import logger - from semantic_router.route import Route from semantic_router.schema import Encoder, EncoderType, RouteChoice +from semantic_router.utils.logger import logger def is_valid(layer_config: str) -> bool: diff --git a/semantic_router/route.py b/semantic_router/route.py index 30c20887ebcd7073fe2a32630d0d566ada3c945c..12afa7fe0a6824882a6a9da4d2d3845f6b68a62c 100644 --- a/semantic_router/route.py +++ b/semantic_router/route.py @@ -4,10 +4,10 @@ from typing import Any, Callable, Union from pydantic import BaseModel +from semantic_router.schema import RouteChoice from semantic_router.utils import function_call from semantic_router.utils.llm import llm from semantic_router.utils.logger import logger -from semantic_router.schema import RouteChoice def is_valid(route_config: str) -> bool: diff --git a/semantic_router/schema.py b/semantic_router/schema.py index be486888a70f9a0b27d705636038931206e3f1cc..b7a3c9faf7817e48215bcebdab8f3e7140aae970 100644 --- a/semantic_router/schema.py +++ b/semantic_router/schema.py @@ -1,7 +1,7 @@ from enum import Enum -from pydantic.dataclasses import dataclass from pydantic import BaseModel +from pydantic.dataclasses import dataclass from semantic_router.encoders import ( BaseEncoder, diff --git a/test_output.txt b/test_output.txt new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/tests/unit/test_layer.py b/tests/unit/test_layer.py index b8f317935e656c705b3f1d64a47d02e7a53d8ac7..45b57472f0fabfb7b7694e2ee9072540cee0bd23 100644 --- a/tests/unit/test_layer.py +++ b/tests/unit/test_layer.py @@ -1,7 +1,8 @@ import os -import pytest from unittest.mock import mock_open, patch +import pytest + from semantic_router.encoders import BaseEncoder, CohereEncoder, OpenAIEncoder from semantic_router.layer import LayerConfig, RouteLayer from semantic_router.route import Route diff --git a/tests/unit/test_route.py b/tests/unit/test_route.py index 44cf2276b937e6e36faf01a496106b297c15b29d..09a5d235f0183ebd70c1fa1bbdbe7fd842ee6d09 100644 --- a/tests/unit/test_route.py +++ b/tests/unit/test_route.py @@ -1,7 +1,6 @@ from unittest.mock import Mock, patch # , AsyncMock # import pytest - from semantic_router.route import Route, is_valid