added fixes to integraton tests
This commit is contained in:
parent
3152368529
commit
f5d702f8fb
2 changed files with 59 additions and 59 deletions
28
.github/workflows/cli_tests.yml
vendored
28
.github/workflows/cli_tests.yml
vendored
|
|
@ -7,6 +7,28 @@ on:
|
||||||
required: false
|
required: false
|
||||||
type: string
|
type: string
|
||||||
default: '3.11.x'
|
default: '3.11.x'
|
||||||
|
secrets:
|
||||||
|
LLM_PROVIDER:
|
||||||
|
required: true
|
||||||
|
LLM_MODEL:
|
||||||
|
required: true
|
||||||
|
LLM_ENDPOINT:
|
||||||
|
required: true
|
||||||
|
LLM_API_KEY:
|
||||||
|
required: true
|
||||||
|
LLM_API_VERSION:
|
||||||
|
required: true
|
||||||
|
EMBEDDING_PROVIDER:
|
||||||
|
required: true
|
||||||
|
EMBEDDING_MODEL:
|
||||||
|
required: true
|
||||||
|
EMBEDDING_ENDPOINT:
|
||||||
|
required: true
|
||||||
|
EMBEDDING_API_KEY:
|
||||||
|
required: true
|
||||||
|
EMBEDDING_API_VERSION:
|
||||||
|
required: true
|
||||||
|
|
||||||
|
|
||||||
env:
|
env:
|
||||||
RUNTIME__LOG_LEVEL: ERROR
|
RUNTIME__LOG_LEVEL: ERROR
|
||||||
|
|
@ -33,6 +55,12 @@ jobs:
|
||||||
cli-integration-tests:
|
cli-integration-tests:
|
||||||
name: CLI Integration Tests
|
name: CLI Integration Tests
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
|
env:
|
||||||
|
LLM_PROVIDER: openai
|
||||||
|
LLM_MODEL: ${{ secrets.LLM_MODEL }}
|
||||||
|
LLM_ENDPOINT: ${{ secrets.LLM_ENDPOINT }}
|
||||||
|
LLM_API_KEY: ${{ secrets.LLM_API_KEY }}
|
||||||
|
LLM_API_VERSION: ${{ secrets.LLM_API_VERSION }}
|
||||||
steps:
|
steps:
|
||||||
- name: Check out repository
|
- name: Check out repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
|
||||||
|
|
@ -238,10 +238,6 @@ def setup_logging(log_level=None, name=None):
|
||||||
"""
|
"""
|
||||||
global _is_structlog_configured
|
global _is_structlog_configured
|
||||||
|
|
||||||
# Check if we should use minimal logging (for CLI)
|
|
||||||
if os.getenv("COGNEE_MINIMAL_LOGGING") == "true":
|
|
||||||
return _setup_minimal_logging(log_level, name)
|
|
||||||
|
|
||||||
# Regular detailed logging for non-CLI usage
|
# Regular detailed logging for non-CLI usage
|
||||||
log_level = log_level if log_level else log_levels[os.getenv("LOG_LEVEL", "INFO")]
|
log_level = log_level if log_level else log_levels[os.getenv("LOG_LEVEL", "INFO")]
|
||||||
|
|
||||||
|
|
@ -377,69 +373,45 @@ def setup_logging(log_level=None, name=None):
|
||||||
# Mark logging as configured
|
# Mark logging as configured
|
||||||
_is_structlog_configured = True
|
_is_structlog_configured = True
|
||||||
|
|
||||||
|
from cognee.infrastructure.databases.relational.config import get_relational_config
|
||||||
|
from cognee.infrastructure.databases.vector.config import get_vectordb_config
|
||||||
|
from cognee.infrastructure.databases.graph.config import get_graph_config
|
||||||
|
|
||||||
|
graph_config = get_graph_config()
|
||||||
|
vector_config = get_vectordb_config()
|
||||||
|
relational_config = get_relational_config()
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Get base database directory path
|
||||||
|
from cognee.base_config import get_base_config
|
||||||
|
|
||||||
|
base_config = get_base_config()
|
||||||
|
databases_path = os.path.join(base_config.system_root_directory, "databases")
|
||||||
|
except:
|
||||||
|
raise ValueError
|
||||||
|
|
||||||
# Get a configured logger and log system information
|
# Get a configured logger and log system information
|
||||||
logger = structlog.get_logger(name if name else __name__)
|
logger = structlog.get_logger(name if name else __name__)
|
||||||
|
# Detailed initialization for regular usage
|
||||||
|
logger.info(
|
||||||
|
"Logging initialized",
|
||||||
|
python_version=PYTHON_VERSION,
|
||||||
|
structlog_version=STRUCTLOG_VERSION,
|
||||||
|
cognee_version=COGNEE_VERSION,
|
||||||
|
os_info=OS_INFO,
|
||||||
|
database_path=databases_path,
|
||||||
|
graph_database_name=graph_config.graph_database_name,
|
||||||
|
vector_config=vector_config.vector_db_provider,
|
||||||
|
relational_config=relational_config.db_name,
|
||||||
|
)
|
||||||
|
|
||||||
# Provide compact logging for CLI mode, detailed for regular mode
|
# Log database configuration
|
||||||
if os.getenv("COGNEE_CLI_MODE") == "true":
|
log_database_configuration(logger)
|
||||||
# Compact initialization for CLI - just basic info
|
|
||||||
logger.info(f"cognee {COGNEE_VERSION} ready")
|
|
||||||
# Log basic database path only
|
|
||||||
try:
|
|
||||||
from cognee.base_config import get_base_config
|
|
||||||
|
|
||||||
base_config = get_base_config()
|
|
||||||
databases_path = os.path.join(base_config.system_root_directory, "databases")
|
|
||||||
logger.info(f"Storage: {databases_path}")
|
|
||||||
except Exception:
|
|
||||||
pass # Silent fail for CLI mode
|
|
||||||
|
|
||||||
else:
|
|
||||||
# Detailed initialization for regular usage
|
|
||||||
logger.info(
|
|
||||||
"Logging initialized",
|
|
||||||
python_version=PYTHON_VERSION,
|
|
||||||
structlog_version=STRUCTLOG_VERSION,
|
|
||||||
cognee_version=COGNEE_VERSION,
|
|
||||||
os_info=OS_INFO,
|
|
||||||
)
|
|
||||||
|
|
||||||
# Log database configuration
|
|
||||||
log_database_configuration(logger)
|
|
||||||
|
|
||||||
# Return the configured logger
|
# Return the configured logger
|
||||||
return logger
|
return logger
|
||||||
|
|
||||||
|
|
||||||
def _setup_minimal_logging(log_level=None, name=None):
|
|
||||||
"""Setup minimal logging for CLI usage - based on dlt patterns"""
|
|
||||||
global _is_structlog_configured
|
|
||||||
|
|
||||||
# Use ERROR level for minimal logging, or user-specified level
|
|
||||||
log_level = log_level if log_level else log_levels.get("ERROR", logging.ERROR)
|
|
||||||
|
|
||||||
# Configure external library logging to be quiet
|
|
||||||
configure_external_library_logging()
|
|
||||||
|
|
||||||
# Create a simple logger without verbose initialization
|
|
||||||
logger = logging.getLogger(name if name else __name__)
|
|
||||||
|
|
||||||
if not logger.handlers:
|
|
||||||
# Simple console handler for errors only
|
|
||||||
handler = logging.StreamHandler(sys.stderr)
|
|
||||||
formatter = logging.Formatter(fmt="%(levelname)s: %(message)s", style="%")
|
|
||||||
handler.setFormatter(formatter)
|
|
||||||
handler.setLevel(log_level)
|
|
||||||
logger.addHandler(handler)
|
|
||||||
logger.setLevel(log_level)
|
|
||||||
|
|
||||||
# Skip all the verbose initialization, file handlers, cleanup, etc.
|
|
||||||
# Just return a basic logger that only shows important messages
|
|
||||||
_is_structlog_configured = True # Prevent double initialization
|
|
||||||
|
|
||||||
return logger
|
|
||||||
|
|
||||||
|
|
||||||
def get_log_file_location():
|
def get_log_file_location():
|
||||||
"""Return the file path of the log file in use, if any."""
|
"""Return the file path of the log file in use, if any."""
|
||||||
root_logger = logging.getLogger()
|
root_logger = logging.getLogger()
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue