Skip to content

Commit

Permalink
fix: apply formatting and linting fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
javelin authored and javelin committed Feb 20, 2025
1 parent 4cc0d46 commit 3b537ca
Show file tree
Hide file tree
Showing 19 changed files with 86 additions and 79 deletions.
27 changes: 10 additions & 17 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,15 @@
repos:
- repo: https://github.com/pycqa/isort
rev: 5.12.0
hooks:
- id: isort
name: isort (python)

- repo: https://github.com/psf/black
rev: 24.3.0
hooks:
- id: black
language_version: python3
# - repo: https://github.com/pycqa/isort
# rev: 5.12.0
# hooks:
# - id: isort
# name: isort (python)

- repo: https://github.com/charliermarsh/ruff-pre-commit
# Ruff version.
rev: "v0.0.265"
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
# - repo: https://github.com/psf/black
# rev: 24.3.0
# hooks:
# - id: black
# language_version: python3

- repo: https://github.com/python-poetry/poetry
rev: "1.4.0" # add version here
Expand Down
4 changes: 3 additions & 1 deletion examples/azure-openai/azure-universal.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import os

from dotenv import load_dotenv
from openai import AzureOpenAI

from javelin_sdk import JavelinClient, JavelinConfig
from dotenv import load_dotenv

load_dotenv()

Expand Down
8 changes: 5 additions & 3 deletions examples/bedrock/bedrock_client_universal.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import boto3
import os
import json
from javelin_sdk import JavelinClient, JavelinConfig
import os

import boto3
from dotenv import load_dotenv

from javelin_sdk import JavelinClient, JavelinConfig

load_dotenv()


Expand Down
6 changes: 4 additions & 2 deletions examples/bedrock/langchain-bedrock-universal.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import boto3
import os
from javelin_sdk import JavelinClient, JavelinConfig

import boto3
from dotenv import load_dotenv

from javelin_sdk import JavelinClient, JavelinConfig

load_dotenv()

# This import is from the "langchain_community" extension package
Expand Down
10 changes: 6 additions & 4 deletions examples/document_processing.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import asyncio
import base64
import json
import os
import base64

import requests
import asyncio
from openai import OpenAI, AsyncOpenAI, AzureOpenAI
from javelin_sdk import JavelinClient, JavelinConfig
from openai import AsyncOpenAI, AzureOpenAI, OpenAI
from pydantic import BaseModel

from javelin_sdk import JavelinClient, JavelinConfig

# Environment Variables
openai_api_key = os.getenv("OPENAI_API_KEY")
javelin_api_key = os.getenv("JAVELIN_API_KEY")
Expand Down
8 changes: 5 additions & 3 deletions examples/gemini/gemini-universal.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import os
import json
import os

from dotenv import load_dotenv

# The official OpenAI Python library with Gemini support (via Javelin)
from openai import OpenAI
from javelin_sdk import JavelinClient, JavelinConfig
from pydantic import BaseModel
from dotenv import load_dotenv

from javelin_sdk import JavelinClient, JavelinConfig

load_dotenv()

Expand Down
12 changes: 5 additions & 7 deletions examples/openai/openai-universal.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
import asyncio
import json
import os
import sys
import asyncio

from dotenv import load_dotenv

load_dotenv()

from openai import OpenAI
from openai import AsyncOpenAI
from openai import AsyncOpenAI, OpenAI

from javelin_sdk import JavelinClient, JavelinConfig

# from openai import AzureOpenAI # Not used, but imported for completeness

from javelin_sdk import (
JavelinClient,
JavelinConfig,
)

# -------------------------------
# Helper Functions
Expand Down
10 changes: 6 additions & 4 deletions examples/openai_client.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import asyncio
import base64
import json
import os
import base64

import requests
import asyncio
from openai import OpenAI, AsyncOpenAI, AzureOpenAI
from javelin_sdk import JavelinClient, JavelinConfig
from openai import AsyncOpenAI, AzureOpenAI, OpenAI
from pydantic import BaseModel

from javelin_sdk import JavelinClient, JavelinConfig

# Environment Variables
openai_api_key = os.getenv("OPENAI_API_KEY")
javelin_api_key = os.getenv("JAVELIN_API_KEY")
Expand Down
8 changes: 4 additions & 4 deletions examples/openai_embedding_example.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from langchain_openai import OpenAIEmbeddings
from langchain_openai import ChatOpenAI
from langchain_core.prompts import ChatPromptTemplate
from langchain_core.output_parsers import StrOutputParser
import os

import dotenv
from langchain_core.output_parsers import StrOutputParser
from langchain_core.prompts import ChatPromptTemplate
from langchain_openai import ChatOpenAI, OpenAIEmbeddings

dotenv.load_dotenv()

Expand Down
10 changes: 6 additions & 4 deletions examples/strawberry.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import asyncio
import base64
import json
import os
import base64

import requests
import asyncio
from openai import OpenAI, AsyncOpenAI, AzureOpenAI
from javelin_sdk import JavelinClient, JavelinConfig
from openai import AsyncOpenAI, AzureOpenAI, OpenAI
from pydantic import BaseModel

from javelin_sdk import JavelinClient, JavelinConfig

# Environment Variables
openai_api_key = os.getenv("OPENAI_API_KEY")
javelin_api_key = os.getenv("JAVELIN_API_KEY")
Expand Down
12 changes: 6 additions & 6 deletions javelin_cli/cli.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import argparse
import http.server
import importlib.metadata
import os
import webbrowser
from pathlib import Path
import json
import http.server
import os
import random
import socketserver
import sys
import threading
import urllib.parse
import random
import sys
import webbrowser
from pathlib import Path

import requests

Expand Down
2 changes: 1 addition & 1 deletion javelin_sdk/chat_completions.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import logging
import os
from typing import Any, Dict, List, Optional, Union, Generator
from typing import Any, Dict, Generator, List, Optional, Union

from javelin_sdk.model_adapters import ModelTransformer, TransformationRuleManager
from javelin_sdk.models import EndpointType
Expand Down
17 changes: 8 additions & 9 deletions javelin_sdk/client.py
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
import json
import functools
import inspect
import json
import re
from typing import Any, Coroutine, Dict, Optional, Union
from urllib.parse import urljoin, urlparse, urlunparse, unquote
from urllib.parse import unquote, urljoin, urlparse, urlunparse

import httpx
import re
from opentelemetry.semconv._incubating.attributes import gen_ai_attributes
from opentelemetry.trace import SpanKind, Status, StatusCode

from javelin_sdk.chat_completions import Chat, Completions
from javelin_sdk.models import HttpMethod, JavelinConfig, Request
from javelin_sdk.services.gateway_service import GatewayService
from javelin_sdk.services.modelspec_service import ModelSpecService
from javelin_sdk.services.provider_service import ProviderService
from javelin_sdk.services.route_service import RouteService
from javelin_sdk.services.secret_service import SecretService
from javelin_sdk.services.template_service import TemplateService
from javelin_sdk.services.trace_service import TraceService
from javelin_sdk.services.modelspec_service import ModelSpecService

from javelin_sdk.tracing_setup import configure_span_exporter
import inspect
from opentelemetry.trace import SpanKind
from opentelemetry.trace import Status, StatusCode
from opentelemetry.semconv._incubating.attributes import gen_ai_attributes

API_BASEURL = "https://api-dev.javelin.live"
API_BASE_PATH = "/v1"
Expand Down
2 changes: 1 addition & 1 deletion javelin_sdk/model_adapters.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import jmespath

from .models import ArrayHandling, ModelSpec, TransformRule, TypeHint, EndpointType
from .models import ArrayHandling, EndpointType, ModelSpec, TransformRule, TypeHint

logger = logging.getLogger(__name__)

Expand Down
3 changes: 2 additions & 1 deletion javelin_sdk/services/modelspec_service.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from typing import Dict, Any, Optional
from typing import Any, Dict, Optional

import httpx

from javelin_sdk.exceptions import (
Expand Down
2 changes: 1 addition & 1 deletion javelin_sdk/services/provider_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
UnauthorizedError,
)
from javelin_sdk.models import (
EndpointType,
HttpMethod,
Provider,
Providers,
Request,
Secrets,
EndpointType,
)


Expand Down
3 changes: 2 additions & 1 deletion javelin_sdk/services/route_service.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from typing import Any, Dict, List, Optional, Union, Generator, AsyncGenerator
import json
import time
from typing import Any, AsyncGenerator, Dict, Generator, List, Optional, Union

import httpx
from jsonpath_ng import parse

Expand Down
12 changes: 6 additions & 6 deletions javelin_sdk/tracing_setup.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# javelin_sdk/tracing_setup.py
# from opentelemetry.instrumentation.botocore import BotocoreInstrumentor
import os

from opentelemetry import trace
from opentelemetry.sdk.resources import Resource
from opentelemetry.sdk.trace import TracerProvider
from opentelemetry.sdk.trace.export import BatchSpanProcessor

# from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
# Use the HTTP exporter instead of the gRPC one
from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter

# from opentelemetry.instrumentation.botocore import BotocoreInstrumentor
import os
from opentelemetry.sdk.resources import Resource
from opentelemetry.sdk.trace import TracerProvider
from opentelemetry.sdk.trace.export import BatchSpanProcessor

# --- OpenTelemetry Setup ---
# TRACES_ENDPOINT = os.getenv("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", "https://api-dev.javelin.live/v1/admin/traces")
Expand Down
9 changes: 5 additions & 4 deletions swagger/sync_models.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import yaml
from pathlib import Path
from typing import Dict, Any, Optional
import re
import os
import re
from pathlib import Path
from typing import Any, Dict, Optional

import requests
import yaml

SWAGGER_FILE_PATH = Path(os.path.join(os.path.dirname(__file__), "swagger.yaml"))
MODELS_FILE_PATH = Path(
Expand Down

0 comments on commit 3b537ca

Please sign in to comment.