From 5a31fa773152e28aeac14da7c6165375c7a7c5fe Mon Sep 17 00:00:00 2001
From: James Briggs <35938317+jamescalam@users.noreply.github.com>
Date: Sat, 13 Jan 2024 01:44:32 +0000
Subject: [PATCH] merge and lint

---
 semantic_router/encoders/__init__.py    | 4 ++--
 semantic_router/encoders/base.py        | 1 +
 semantic_router/encoders/bm25.py        | 2 +-
 semantic_router/encoders/cohere.py      | 2 +-
 semantic_router/encoders/fastembed.py   | 2 +-
 semantic_router/encoders/huggingface.py | 2 +-
 semantic_router/encoders/openai.py      | 2 +-
 semantic_router/hybrid_layer.py         | 2 +-
 semantic_router/layer.py                | 2 +-
 semantic_router/llms/base.py            | 2 +-
 semantic_router/llms/cohere.py          | 2 +-
 semantic_router/llms/openai.py          | 2 +-
 semantic_router/llms/openrouter.py      | 2 +-
 semantic_router/route.py                | 2 +-
 semantic_router/schema.py               | 2 +-
 semantic_router/utils/function_call.py  | 2 +-
 semantic_router/utils/splitters.py      | 3 ++-
 tests/unit/test_hybrid_layer.py         | 4 ++--
 18 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/semantic_router/encoders/__init__.py b/semantic_router/encoders/__init__.py
index 57cebca8..b4668154 100644
--- a/semantic_router/encoders/__init__.py
+++ b/semantic_router/encoders/__init__.py
@@ -2,10 +2,10 @@ from semantic_router.encoders.base import BaseEncoder
 from semantic_router.encoders.bm25 import BM25Encoder
 from semantic_router.encoders.cohere import CohereEncoder
 from semantic_router.encoders.fastembed import FastEmbedEncoder
-from semantic_router.encoders.openai import OpenAIEncoder
-from semantic_router.encoders.zure import AzureOpenAIEncoder
 from semantic_router.encoders.huggingface import HuggingFaceEncoder
+from semantic_router.encoders.openai import OpenAIEncoder
 from semantic_router.encoders.tfidf import TfidfEncoder
+from semantic_router.encoders.zure import AzureOpenAIEncoder
 
 __all__ = [
     "BaseEncoder",
diff --git a/semantic_router/encoders/base.py b/semantic_router/encoders/base.py
index edc98641..a3bac324 100644
--- a/semantic_router/encoders/base.py
+++ b/semantic_router/encoders/base.py
@@ -1,4 +1,5 @@
 from typing import List
+
 from pydantic import BaseModel, Field
 
 
diff --git a/semantic_router/encoders/bm25.py b/semantic_router/encoders/bm25.py
index 83cbccc0..1965fb6e 100644
--- a/semantic_router/encoders/bm25.py
+++ b/semantic_router/encoders/bm25.py
@@ -1,4 +1,4 @@
-from typing import Any, Optional, List, Dict
+from typing import Any, Dict, List, Optional
 
 from semantic_router.encoders import BaseEncoder
 from semantic_router.utils.logger import logger
diff --git a/semantic_router/encoders/cohere.py b/semantic_router/encoders/cohere.py
index 803fe779..4f108095 100644
--- a/semantic_router/encoders/cohere.py
+++ b/semantic_router/encoders/cohere.py
@@ -1,5 +1,5 @@
 import os
-from typing import Optional, List
+from typing import List, Optional
 
 import cohere
 
diff --git a/semantic_router/encoders/fastembed.py b/semantic_router/encoders/fastembed.py
index ec356317..018eeee1 100644
--- a/semantic_router/encoders/fastembed.py
+++ b/semantic_router/encoders/fastembed.py
@@ -1,4 +1,4 @@
-from typing import Any, Optional, List
+from typing import Any, List, Optional
 
 import numpy as np
 from pydantic import PrivateAttr
diff --git a/semantic_router/encoders/huggingface.py b/semantic_router/encoders/huggingface.py
index 2166ea13..d1b20757 100644
--- a/semantic_router/encoders/huggingface.py
+++ b/semantic_router/encoders/huggingface.py
@@ -1,4 +1,4 @@
-from typing import Any, Optional, List
+from typing import Any, List, Optional
 
 from pydantic import PrivateAttr
 
diff --git a/semantic_router/encoders/openai.py b/semantic_router/encoders/openai.py
index 3b06d33d..761f4931 100644
--- a/semantic_router/encoders/openai.py
+++ b/semantic_router/encoders/openai.py
@@ -1,6 +1,6 @@
 import os
 from time import sleep
-from typing import Optional, List
+from typing import List, Optional
 
 import openai
 from openai import OpenAIError
diff --git a/semantic_router/hybrid_layer.py b/semantic_router/hybrid_layer.py
index f3eb3e64..71598a15 100644
--- a/semantic_router/hybrid_layer.py
+++ b/semantic_router/hybrid_layer.py
@@ -1,4 +1,4 @@
-from typing import Optional, List, Dict, Tuple
+from typing import Dict, List, Optional, Tuple
 
 import numpy as np
 from numpy.linalg import norm
diff --git a/semantic_router/layer.py b/semantic_router/layer.py
index bce160ba..15b3fc0d 100644
--- a/semantic_router/layer.py
+++ b/semantic_router/layer.py
@@ -1,6 +1,6 @@
 import json
 import os
-from typing import Optional, Any, List, Dict, Tuple
+from typing import Any, Dict, List, Optional, Tuple
 
 import numpy as np
 import yaml
diff --git a/semantic_router/llms/base.py b/semantic_router/llms/base.py
index 12d89f2d..25602611 100644
--- a/semantic_router/llms/base.py
+++ b/semantic_router/llms/base.py
@@ -1,4 +1,4 @@
-from typing import Optional, List
+from typing import List, Optional
 
 from pydantic import BaseModel
 
diff --git a/semantic_router/llms/cohere.py b/semantic_router/llms/cohere.py
index 0eebbe6d..1a3c8e3c 100644
--- a/semantic_router/llms/cohere.py
+++ b/semantic_router/llms/cohere.py
@@ -1,5 +1,5 @@
 import os
-from typing import Optional, List
+from typing import List, Optional
 
 import cohere
 
diff --git a/semantic_router/llms/openai.py b/semantic_router/llms/openai.py
index 06d6865c..b0c7d0e6 100644
--- a/semantic_router/llms/openai.py
+++ b/semantic_router/llms/openai.py
@@ -1,5 +1,5 @@
 import os
-from typing import Optional, List
+from typing import List, Optional
 
 import openai
 
diff --git a/semantic_router/llms/openrouter.py b/semantic_router/llms/openrouter.py
index 8c3efb8d..4e687207 100644
--- a/semantic_router/llms/openrouter.py
+++ b/semantic_router/llms/openrouter.py
@@ -1,5 +1,5 @@
 import os
-from typing import Optional, List
+from typing import List, Optional
 
 import openai
 
diff --git a/semantic_router/route.py b/semantic_router/route.py
index bf24b14c..3934d64f 100644
--- a/semantic_router/route.py
+++ b/semantic_router/route.py
@@ -1,6 +1,6 @@
 import json
 import re
-from typing import Any, Callable, Optional, Union, List, Dict
+from typing import Any, Callable, Dict, List, Optional, Union
 
 from pydantic import BaseModel
 
diff --git a/semantic_router/schema.py b/semantic_router/schema.py
index 7dcb7fde..7529750d 100644
--- a/semantic_router/schema.py
+++ b/semantic_router/schema.py
@@ -1,5 +1,5 @@
 from enum import Enum
-from typing import Optional, Literal, List, Dict
+from typing import Dict, List, Literal, Optional
 
 from pydantic import BaseModel
 from pydantic.dataclasses import dataclass
diff --git a/semantic_router/utils/function_call.py b/semantic_router/utils/function_call.py
index 1b42a613..fd009c40 100644
--- a/semantic_router/utils/function_call.py
+++ b/semantic_router/utils/function_call.py
@@ -1,6 +1,6 @@
 import inspect
 import json
-from typing import Any, Callable, Union, Dict, List
+from typing import Any, Callable, Dict, List, Union
 
 from pydantic import BaseModel
 
diff --git a/semantic_router/utils/splitters.py b/semantic_router/utils/splitters.py
index 83a32839..9f0c4704 100644
--- a/semantic_router/utils/splitters.py
+++ b/semantic_router/utils/splitters.py
@@ -1,5 +1,6 @@
+from typing import Dict, List, Literal
+
 import numpy as np
-from typing import List, Dict, Literal
 
 from semantic_router.encoders import BaseEncoder
 
diff --git a/tests/unit/test_hybrid_layer.py b/tests/unit/test_hybrid_layer.py
index aa7a33c0..18bdbddf 100644
--- a/tests/unit/test_hybrid_layer.py
+++ b/tests/unit/test_hybrid_layer.py
@@ -44,7 +44,6 @@ def openai_encoder(mocker):
 
 
 @pytest.fixture
-
 def azure_encoder(mocker):
     mocker.patch.object(AzureOpenAIEncoder, "__call__", side_effect=mock_encoder_call)
     return AzureOpenAIEncoder(
@@ -55,17 +54,18 @@ def azure_encoder(mocker):
         model="test_model",
     )
 
+
 def bm25_encoder(mocker):
     mocker.patch.object(BM25Encoder, "__call__", side_effect=mock_encoder_call)
     return BM25Encoder(name="test-bm25-encoder")
 
+
 @pytest.fixture
 def tfidf_encoder(mocker):
     mocker.patch.object(TfidfEncoder, "__call__", side_effect=mock_encoder_call)
     return TfidfEncoder(name="test-tfidf-encoder")
 
 
-
 @pytest.fixture
 def routes():
     return [
-- 
GitLab