Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from typing import Union
from sqlalchemy.orm import Session
from app.crud.base import CRUDBase
from app.core.config import get_originated_from, OriginationEnum
from app.core.config import OriginationEnum
from ..models.bertopic_embedding_pretrained import BertopicEmbeddingPretrainedModel
from app.ppg_common.schemas.bertopic.bertopic_embedding_pretrained import BertopicEmbeddingPretrainedCreate, BertopicEmbeddingPretrainedUpdate

Expand Down
1 change: 0 additions & 1 deletion app/aimodels/bertopic/models/document.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from typing import TYPE_CHECKING
from sqlalchemy import Column, DateTime, UUID, String, Enum
from sqlalchemy.orm import relationship
from sqlalchemy.sql import func
from app.db.base_class import Base
from app.core.config import get_originated_from, OriginationEnum
import uuid
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from typing import TYPE_CHECKING
from sqlalchemy import Column, ForeignKey, Table, Enum
from sqlalchemy import Column, ForeignKey, Table
from app.db.base_class import Base

if TYPE_CHECKING:
Expand Down
3 changes: 0 additions & 3 deletions app/aimodels/bertopic/models/topic.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
from typing import TYPE_CHECKING
from sqlalchemy import Column, UUID, String, Enum, JSON, Integer, Boolean, ForeignKey
from sqlalchemy.ext.mutable import MutableDict
from sqlalchemy.orm import relationship
from sqlalchemy.sql import func
from app.db.base_class import Base
from app.core.config import get_originated_from, OriginationEnum
import uuid
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import pickle
import pandas as pd
from typing import Union
from io import TextIOWrapper, StringIO, BytesIO, BufferedReader
from io import StringIO, BytesIO

from fastapi import Depends, APIRouter, UploadFile
from fastapi import HTTPException
Expand Down
2 changes: 0 additions & 2 deletions app/aimodels/bertopic/routers/documents.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import os
from typing import Union
from fastapi import Depends, APIRouter
from pydantic import UUID4
from sqlalchemy.orm import Session
from app.dependencies import get_db
from app.core.errors import HTTPValidationError
Expand Down
4 changes: 1 addition & 3 deletions app/aimodels/bertopic/routers/summarization.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import json
from typing import Union, Any
from pydantic import BaseModel, UUID4
from pydantic import UUID4
from fastapi import Depends, APIRouter, HTTPException
from fastapi.encoders import jsonable_encoder
from fastapi.responses import HTMLResponse
from sqlalchemy.orm import Session
from app.dependencies import get_db
Expand Down
2 changes: 1 addition & 1 deletion app/aimodels/bertopic/routers/train.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import pandas as pd
from app.core.logging import logger
from app.core.s3 import pickle_and_upload_object_to_s3
from app.core.errors import ValidationError, HTTPValidationError
from app.core.errors import HTTPValidationError
from app.core.config import settings, get_acronym_dictionary, get_icao_dictionary
from app.dependencies import get_db, get_s3
from app.ppg_common.schemas.bertopic.document_embedding_computation import DocumentEmbeddingComputationCreate
Expand Down
3 changes: 1 addition & 2 deletions app/aimodels/gpt4all/crud/crud_llm_pretrained.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@

from typing import Union
from sqlalchemy.orm import Session
from sqlalchemy import func
from app.core.config import get_originated_from, OriginationEnum
from app.core.config import OriginationEnum
from app.crud.base import CRUDBase
from app.ppg_common.schemas.gpt4all.llm_pretrained import LlmPretrainedCreate, LlmPretrainedUpdate
from ..models import LlmPretrainedModel
Expand Down
2 changes: 0 additions & 2 deletions app/aimodels/gpt4all/models/llm_pretrained.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import uuid
from typing import TYPE_CHECKING
from sqlalchemy import Column, Enum, Integer, UUID, String, Boolean, Sequence
from sqlalchemy.orm import relationship
from app.db.base_class import Base
from app.core.config import get_originated_from, OriginationEnum
from app.ppg_common.schemas.gpt4all.llm_pretrained import LlmFilenameEnum
Expand Down
1 change: 0 additions & 1 deletion app/aimodels/gpt4all/routers/pretrained.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

import hashlib
from typing import Union
from aiofiles import open as open_aio
from fastapi import Depends, APIRouter, UploadFile, HTTPException
from pydantic import UUID4
from sqlalchemy.orm import Session
Expand Down
1 change: 0 additions & 1 deletion app/chat_search/ai_services/service.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
from app.chat_search.ai_services.marco_rerank_retriever import MarcoRerankRetriever
from app.core.errors import ValidationError
from app.core.s3 import download_pickled_object_from_s3
from app.core.model_cache import MODEL_CACHE_BASEDIR
from app.core.config import settings
from app.aimodels.bertopic.crud import (
bertopic_embedding_pretrained as bertopic_embedding_pretrained_crud,
Expand Down
10 changes: 1 addition & 9 deletions app/chat_search/routers/retrieval.py
Original file line number Diff line number Diff line change
@@ -1,25 +1,17 @@
import os
from fastapi import Depends, APIRouter, HTTPException
from fastapi import Depends, APIRouter
from fastapi.responses import HTMLResponse
from jinja2 import Environment, FileSystemLoader
from pydantic import BaseModel
from sqlalchemy.orm import Session
from mypy_boto3_s3.client import S3Client

from app.aimodels.gpt4all.models.llm_pretrained import (
LlmFilenameEnum,
LlmPretrainedModel,
)
from app.aimodels.gpt4all.routers.completions import (
validate_inputs_and_generate_service,
)
from app.dependencies import get_db, get_s3
from app.core.config import settings
from ... import crud
from app.aimodels.gpt4all.ai_services.completion_inference import (
CompletionInference,
CompletionInferenceInputs,
CompletionInferenceOutputs,
)
from ..ai_services.service import RetrievalService

Expand Down
4 changes: 2 additions & 2 deletions app/core/config.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import os
import enum
from typing import Optional, Any
from pydantic import PostgresDsn, validator, field_validator, ValidationInfo
from pydantic import PostgresDsn, field_validator, ValidationInfo
from pydantic_settings import BaseSettings

class OriginationEnum(str, enum.Enum):
Expand All @@ -16,7 +16,7 @@ class EnvironmentSettings(BaseSettings):
class Settings(BaseSettings):
# general settings
docs_ui_root_path: str = ""
log_level: str = "INFO"
log_level: str = "WARNING"
originated_from: OriginationEnum = OriginationEnum.ORIGINATED_FROM_APP
acronym_dictionary: dict = {}
icao_dictionary: dict = {}
Expand Down
2 changes: 0 additions & 2 deletions app/initial_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
from tqdm import tqdm
from typing import Union
from fastapi import UploadFile
from fastapi.encoders import jsonable_encoder
from mypy_boto3_s3.client import S3Client

import app.ppg_common.services.mattermost_utils as mattermost_utils
Expand All @@ -21,7 +20,6 @@
from app.ppg_common.schemas.mattermost.mattermost_documents import ThreadTypeEnum

from app.aimodels.bertopic.models.bertopic_embedding_pretrained import BertopicEmbeddingPretrainedModel, EmbeddingModelTypeEnum
from app.aimodels.bertopic.models.document import DocumentModel
from app.aimodels.gpt4all.models.llm_pretrained import LlmPretrainedModel, LlmFilenameEnum

from app.db.init_db import init_db, wipe_db, drop_constraints
Expand Down
1 change: 0 additions & 1 deletion app/mattermost/crud/crud_mattermost.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from typing import Union
from datetime import datetime, timedelta
import pandas as pd
import numpy as np
from fastapi import HTTPException
from sqlalchemy.orm import Session
from app.core.config import settings
Expand Down
2 changes: 1 addition & 1 deletion app/mattermost/models/mattermost_channels.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from app.core.config import get_originated_from, OriginationEnum

if TYPE_CHECKING:
from .mattermost_documents import MattermostDocumentModel
pass


class MattermostChannelModel(Base):
Expand Down
4 changes: 1 addition & 3 deletions app/mattermost/models/mattermost_documents.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
from app.ppg_common.schemas.mattermost.mattermost_documents import InfoTypeEnum, ThreadTypeEnum

if TYPE_CHECKING:
from .mattermost_channels import MattermostChannelModel
from .mattermost_users import MattermostUserModel
from app.aimodels.bertopic.models.document import DocumentModel
pass


class MattermostDocumentModel(Base):
Expand Down
2 changes: 1 addition & 1 deletion app/nitmre_nlp_utils/preprocess.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def _tokenize(msg: str) -> set[str]:
/ often used between acronyms in an explicit/implied coordination
line (e.g., DO/LL)
"""
p = re.compile('[^\w/#@]+')
p = re.compile(r'[^\w/#@]+')
return set(p.split(msg)) # only keep unique tokens to avoid revisiting during preprocessing


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
from fastapi.testclient import TestClient
from app.core.config import OriginationEnum
from app.ppg_common.schemas.bertopic.bertopic_embedding_pretrained import BertopicEmbeddingPretrainedCreate
from app.aimodels.bertopic.models.bertopic_embedding_pretrained import BertopicEmbeddingPretrainedModel
from app.aimodels.bertopic.crud.crud_bertopic_embedding_pretrained import CRUDBertopicEmbeddingPretrained, bertopic_embedding_pretrained
from app.aimodels.bertopic.crud.crud_bertopic_embedding_pretrained import bertopic_embedding_pretrained
from app.aimodels.bertopic.ai_services.weak_learning import WeakLearner
from fastapi.encoders import jsonable_encoder

Expand Down
2 changes: 0 additions & 2 deletions tests/aimodels/gpt4all/ai_services/conftest.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
from unittest.mock import create_autospec
from sqlalchemy.orm import Session

from app.ppg_common.schemas.gpt4all.llm_pretrained import LlmPretrainedCreate
from app.aimodels.gpt4all import crud
from app.aimodels.gpt4all.models.llm_pretrained import LlmPretrainedModel

import pytest
Expand Down