[0.2.0] fixing folders issues with src/

Author: doramirdor

README.md

@@ -91,7 +91,7 @@ HUGGINGFACE_API_KEY=your_huggingface_api_key
 ### 🔹 Select the Best LLM for a Prompt
 
 ```python
-from src.nadir.llm_selector.selector.auto import AutoSelector
+from nadir.llm_selector.selector.auto import AutoSelector
 
 nadir = AutoSelector()
 prompt = "Explain quantum entanglement in simple terms."
@@ -119,8 +119,8 @@ print(models)
 ### 🔹 Analyzing Code Complexity and Selecting the Best LLM
 
 ```python
-from src.nadir.complexity.llm import LLMComplexityAnalyzer
-from src.nadir.llm_selector.selector.auto import AutoSelector
+from nadir.complexity.llm import LLMComplexityAnalyzer
+from nadir.llm_selector.selector.auto import AutoSelector
 
 # Initialize the LLM-based complexity analyzer
 complexity_analyzer = LLMComplexityAnalyzer()
@@ -149,8 +149,8 @@ print("Selected Model:", selected_model.name)
 ### 🔹 Compressing Long Prompts Before Model Selection
 
 ```python
-from src.nadir.compression import GeminiCompressor
-from src.nadir.llm_selector.selector.auto import AutoSelector
+from nadir.compression import GeminiCompressor
+from nadir.llm_selector.selector.auto import AutoSelector
 
 # Initialize Gemini-based prompt compression
 compressor = GeminiCompressor()
@@ -177,9 +177,9 @@ print("Selected Model:", selected_model.name)
 ### 🔹 Combining Compression & Complexity Analysis
 
 ```python
-from src.nadir.compression import GeminiCompressor
-from src.nadir.complexity.llm import LLMComplexityAnalyzer
-from src.nadir.llm_selector.selector.auto import AutoSelector
+from nadir.compression import GeminiCompressor
+from nadir.complexity.llm import LLMComplexityAnalyzer
+from nadir.llm_selector.selector.auto import AutoSelector
 
 # Initialize complexity analyzer and compressor
 complexity_analyzer = LLMComplexityAnalyzer()

examples/compression_usage.ipynb

@@ -29,10 +29,10 @@
     }
    ],
    "source": [
-    "from src.nadir.compression.fast import FasCompressor\n",
-    "from src.nadir.compression.code import CodeCompressor\n",
-    "from src.nadir.compression.gemini import GeminiCompressor\n",
-    "from src.nadir.compression.openai import OpenaiCompressor"
+    "from nadir.compression.fast import FasCompressor\n",
+    "from nadir.compression.code import CodeCompressor\n",
+    "from nadir.compression.gemini import GeminiCompressor\n",
+    "from nadir.compression.openai import OpenaiCompressor"
    ]
   },
   {

examples/gemini_complextiy_analyzer.ipynb

@@ -21,7 +21,7 @@
     "import statistics\n",
     "sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(\"src\"), '..')))\n",
     "\n",
-    "from src.nadir.complexity.llm import LLMComplexityAnalyzer"
+    "from nadir.complexity.llm import LLMComplexityAnalyzer"
    ]
   },
   {
@@ -752,7 +752,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from src.nadir.complextiy.advance import AdvancedComplexityAnalyzer\n",
+    "from nadir.complextiy.advance import AdvancedComplexityAnalyzer\n",
     "analyzer = AdvancedComplexityAnalyzer()\n",
     "\n",
     "for i, prompt in enumerate(prompts):\n",
@@ -778,7 +778,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from src.nadir.complexity.analyzer import ComplexityAnalyzer\n",
+    "from nadir.complexity.analyzer import ComplexityAnalyzer\n",
     "analyzer = ComplexityAnalyzer()\n",
     "\n",
     "for i, prompt in enumerate(prompts):\n",

examples/latency_test.ipynb

@@ -10,7 +10,7 @@
     "import os\n",
     "sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(\"src\"), '..')))\n",
     "\n",
-    "from src.nadir.complextiy.analyzer import ComplexityAnalyzer"
+    "from nadir.complextiy.analyzer import ComplexityAnalyzer"
    ]
   },
   {

examples/openai_useage.ipynb

@@ -28,17 +28,17 @@
    ],
    "source": [
     "import os\n",
-    "from src.nadir.llm_selector.selector.auto import AutoSelector\n",
-    "from src.nadir.config.settings import ModelConfig, DynamicLLMSelectorConfig\n",
-    "from src.nadir.llm_selector.model_registry import ModelRegistry, ModelConfig\n",
-    "from src.nadir.compression.openai import OpenaiCompressor\n",
-    "from src.nadir.compression.gemini import GeminiCompressor\n",
-    "from src.nadir.llm_selector.providers.openai import OpenAIProvider\n",
-    "from src.nadir.llm_selector.providers.gemini import GeminiProvider\n",
-    "from src.nadir.llm_selector.providers.anthropic import AnthropicProvider\n",
-    "from src.nadir.complexity.llm import LLMComplexityAnalyzer\n",
-    "from src.nadir.complexity.code import CodeComplexityAnalyzer\n",
-    "from src.nadir.compression.code import CodeCompressor"
+    "from nadir.llm_selector.selector.auto import AutoSelector\n",
+    "from nadir.config.settings import ModelConfig, DynamicLLMSelectorConfig\n",
+    "from nadir.llm_selector.model_registry import ModelRegistry, ModelConfig\n",
+    "from nadir.compression.openai import OpenaiCompressor\n",
+    "from nadir.compression.gemini import GeminiCompressor\n",
+    "from nadir.llm_selector.providers.openai import OpenAIProvider\n",
+    "from nadir.llm_selector.providers.gemini import GeminiProvider\n",
+    "from nadir.llm_selector.providers.anthropic import AnthropicProvider\n",
+    "from nadir.complexity.llm import LLMComplexityAnalyzer\n",
+    "from nadir.complexity.code import CodeComplexityAnalyzer\n",
+    "from nadir.compression.code import CodeCompressor"
    ]
   },
   {
@@ -559,7 +559,7 @@
     }
    ],
    "source": [
-    "from src.nadir.complexity.analyzer import ComplexityAnalyzer\n",
+    "from nadir.complexity.analyzer import ComplexityAnalyzer\n",
     "base_analyzer = ComplexityAnalyzer(candidate_names=[\"openai/gpt-4o\"])"
    ]
   },
@@ -1184,7 +1184,7 @@
     "import sys\n",
     "import os\n",
     "sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(\"src\"), '..')))\n",
-    "from src.nadir.llm_selector.selector.auto import AutoSelector\n",
+    "from nadir.llm_selector.selector.auto import AutoSelector\n",
     "auto_selector = AutoSelector()"
    ]
   },

scripts/benchmark.py

@@ -1,6 +1,6 @@
 import time
 import statistics
-from src.nadir.llm_selector.selector.auto import AutoSelector
+from nadir.llm_selector.selector.auto import AutoSelector
 
 def benchmark_model_selection():
     """

scripts/train_complexity_model.py

@@ -1,7 +1,7 @@
 import numpy as np
 from sklearn.model_selection import train_test_split
 from sklearn.ensemble import RandomForestRegressor
-from src.nadir.complexity.analyzer import ComplexityAnalyzer
+from nadir.complexity.analyzer import ComplexityAnalyzer
 
 def generate_synthetic_data(num_samples=1000):
     """

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="nadir-llm", 
-    version="0.1.0",
+    version="0.2.0",
     description="A package for dynamically selecting and interacting with LLMs.",
     author="Dor Amir",
     author_email="[email protected]",

src/nadir/complexity/__init__.py

@@ -5,7 +5,7 @@
 from abc import ABC, abstractmethod
 from typing import Dict, Any, Optional, List
 
-from src.nadir.utils import load_performance_config
+from nadir.utils import load_performance_config
 
 # Configure logging
 logging.basicConfig(level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s")

src/nadir/complexity/analyzer.py

@@ -5,8 +5,8 @@
 import logging
 import tiktoken
 from typing import Dict, Any, List, Optional
-from src.nadir.complexity import BaseComplexityAnalyzer
-from src.nadir.utils import load_performance_config
+from nadir.complexity import BaseComplexityAnalyzer
+from nadir.utils import load_performance_config
 
 logging.basicConfig(level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s")
 

src/nadir/complexity/code.py

@@ -5,7 +5,7 @@
 import logging
 from typing import Dict, Any, List, Tuple, Optional
 from collections import defaultdict
-from src.nadir.complexity import BaseComplexityAnalyzer
+from nadir.complexity import BaseComplexityAnalyzer
 
 # Configure Logging
 logging.basicConfig(level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s")

src/nadir/complexity/llm.py

@@ -3,7 +3,7 @@
 import logging
 from typing import Dict, Any, Optional, List
 from litellm import completion
-from src.nadir.complexity import BaseComplexityAnalyzer
+from nadir.complexity import BaseComplexityAnalyzer
 
 # Configure logging
 logging.basicConfig(level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s")

src/nadir/complexity/llm_code.py

@@ -3,7 +3,7 @@
 import logging
 from typing import Dict, Any, Optional, List
 from litellm import completion
-from src.nadir.complexity import BaseComplexityAnalyzer
+from nadir.complexity import BaseComplexityAnalyzer
 
 # Configure logging
 logging.basicConfig(level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s")

src/nadir/compression/gemini.py

@@ -6,7 +6,7 @@
 import google.generativeai as genai
 from transformers import pipeline
 
-from src.nadir.compression import BaseCompression
+from nadir.compression import BaseCompression
 
 
 class GeminiCompressor(BaseCompression):

src/nadir/compression/openai.py

@@ -6,7 +6,7 @@
 
 from transformers import pipeline
 
-from src.nadir.compression import BaseCompression
+from nadir.compression import BaseCompression
 
 class OpenaiCompressor(BaseCompression):
     """

src/nadir/config/settings.py

@@ -1,7 +1,7 @@
 from typing import Dict, Optional, List
 from pydantic import BaseModel, Field, ConfigDict, field_validator
-from src.nadir.llm_selector.providers import BaseProvider
-from src.nadir.llm_selector.providers.anthropic import AnthropicProvider
+from nadir.llm_selector.providers import BaseProvider
+from nadir.llm_selector.providers.anthropic import AnthropicProvider
 import os
 
 class ModelConfig(BaseModel):

src/nadir/llm_selector/model_registry.py

@@ -1,10 +1,10 @@
 from typing import List, Dict, Any
 from dataclasses import dataclass, field
-from src.nadir.llm_selector.providers import BaseProvider
-from src.nadir.llm_selector.providers.anthropic import AnthropicProvider
-from src.nadir.llm_selector.providers.openai import OpenAIProvider
-from src.nadir.llm_selector.providers.huggingface import HuggingFaceProvider
-from src.nadir.config.settings import ModelConfig
+from nadir.llm_selector.providers import BaseProvider
+from nadir.llm_selector.providers.anthropic import AnthropicProvider
+from nadir.llm_selector.providers.openai import OpenAIProvider
+from nadir.llm_selector.providers.huggingface import HuggingFaceProvider
+from nadir.config.settings import ModelConfig
 
 class ModelRegistry:
     def __init__(self):

src/nadir/llm_selector/providers/anthropic.py

@@ -1,4 +1,4 @@
-from src.nadir.llm_selector.providers import BaseProvider
+from nadir.llm_selector.providers import BaseProvider
 from typing import Dict, Any
 
 

src/nadir/llm_selector/providers/deepseek.py

@@ -1,4 +1,4 @@
-from src.nadir.llm_selector.providers import BaseProvider
+from nadir.llm_selector.providers import BaseProvider
 from typing import Dict, Any
 
 class DeepSeekProvider(BaseProvider):

src/nadir/llm_selector/providers/gemini.py

@@ -1,4 +1,4 @@
-from src.nadir.llm_selector.providers import BaseProvider
+from nadir.llm_selector.providers import BaseProvider
 from typing import Dict, Any
 
 class GeminiProvider(BaseProvider):

src/nadir/llm_selector/providers/huggingface.py

@@ -1,4 +1,4 @@
-from src.nadir.llm_selector.providers import BaseProvider
+from nadir.llm_selector.providers import BaseProvider
 from typing import Dict, Any
 
 

src/nadir/llm_selector/providers/openai.py

@@ -1,4 +1,4 @@
-from src.nadir.llm_selector.providers import BaseProvider
+from nadir.llm_selector.providers import BaseProvider
 from typing import Dict, Any
 
 class OpenAIProvider(BaseProvider):

src/nadir/llm_selector/selector/auto.py

@@ -3,16 +3,16 @@
 import os
 import logging
 from typing import Dict, Any, List, Optional
-from src.nadir.utils import load_performance_config, safe_float
-from src.nadir.complexity import BaseComplexityAnalyzer  
-from src.nadir.complexity.llm import LLMComplexityAnalyzer
-from src.nadir.llm_selector.model_registry import ModelRegistry
-from src.nadir.config.settings import DynamicLLMSelectorConfig, ModelConfig
-from src.nadir.llm_selector.providers.openai import OpenAIProvider
-from src.nadir.llm_selector.providers.gemini import GeminiProvider
-from src.nadir.llm_selector.providers.anthropic import AnthropicProvider
-from src.nadir.compression import BaseCompression
-from src.nadir.cost.tracker import CostTracker
+from nadir.utils import load_performance_config, safe_float
+from nadir.complexity import BaseComplexityAnalyzer  
+from nadir.complexity.llm import LLMComplexityAnalyzer
+from nadir.llm_selector.model_registry import ModelRegistry
+from nadir.config.settings import DynamicLLMSelectorConfig, ModelConfig
+from nadir.llm_selector.providers.openai import OpenAIProvider
+from nadir.llm_selector.providers.gemini import GeminiProvider
+from nadir.llm_selector.providers.anthropic import AnthropicProvider
+from nadir.compression import BaseCompression
+from nadir.cost.tracker import CostTracker
 
 # Configure logging
 logging.basicConfig(level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s")

src/nadir/llm_selector/selector/balance.py

@@ -1,5 +1,5 @@
 import logging
-from src.nadir.llm_selector.selector.auto import AutoSelector
+from nadir.llm_selector.selector.auto import AutoSelector
 
 class BalancedSelector(AutoSelector):
     """

src/nadir/llm_selector/selector/budget_friendly.py

@@ -1,5 +1,5 @@
 import logging
-from src.nadir.llm_selector.selector.auto import AutoSelector
+from nadir.llm_selector.selector.auto import AutoSelector
 
 class BudgetFriendlySelector(AutoSelector):
     """

src/nadir/llm_selector/selector/ensemble.py

@@ -1,6 +1,6 @@
 import logging
 from collections import Counter
-from src.nadir.llm_selector.selector.auto import AutoSelector
+from nadir.llm_selector.selector.auto import AutoSelector
 
 class EnsembleSelector(AutoSelector):
     """

src/nadir/llm_selector/selector/low_latency.py

@@ -1,5 +1,5 @@
 import logging
-from src.nadir.llm_selector.selector.auto import AutoSelector
+from nadir.llm_selector.selector.auto import AutoSelector
 
 class LowLatencySelector(AutoSelector):
     """

tests/test_complexity.py

@@ -1,5 +1,5 @@
 import pytest
-from src.nadir.complexity.analyzer import ComplexityAnalyzer
+from nadir.complexity.analyzer import ComplexityAnalyzer
 
 @pytest.fixture
 def complexity_analyzer():

tests/test_compression.py

@@ -1,6 +1,6 @@
 import pytest
 from unittest.mock import MagicMock
-from src.nadir.llm_selector.providers.openai import OpenAIProvider
+from nadir.llm_selector.providers.openai import OpenAIProvider
 
 @pytest.fixture
 def mock_openai_provider():

tests/test_cost_tracking.py

@@ -1,5 +1,5 @@
 import pytest
-from src.nadir.cost.tracker import CostTracker
+from nadir.cost.tracker import CostTracker
 
 def test_cost_tracker():
     tracker = CostTracker()

tests/test_llm_complexity.py

@@ -2,15 +2,15 @@
 import pytest
 import json
 from unittest.mock import patch, MagicMock
-from src.nadir.complexity.llm import LLMComplexityAnalyzer
+from nadir.complexity.llm import LLMComplexityAnalyzer
 
 @pytest.fixture
 def llm_analyzer():
     """Fixture to initialize LLMComplexityAnalyzer."""
     return LLMComplexityAnalyzer(performance_config_path=os.path.join(os.path.dirname(__file__),"assets/model_performance.json"))
 
 
-@patch("src.nadir.complexity.llm.completion")
+@patch("nadir.complexity.llm.completion")
 def test_get_complexity_details(mock_completion, llm_analyzer):
     """Test if LLMComplexityAnalyzer returns valid complexity details."""
 
@@ -35,7 +35,7 @@ def test_get_complexity_details(mock_completion, llm_analyzer):
     assert 0 <= details["overall_complexity"] <= 100
     assert details["recommended_model"] == "openai/gpt-3.5-turbo"
 
-@patch("src.nadir.complexity.llm.completion")
+@patch("nadir.complexity.llm.completion")
 def test_calculate_complexity(mock_completion, llm_analyzer):
     """Test if LLMComplexityAnalyzer calculates a valid complexity score."""