Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Infra/remove unused config values #501

Merged
merged 4 commits into from Mar 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 1 addition & 7 deletions python/langsmith/cli/.env.example
@@ -1,5 +1,5 @@
# Don't change this file. Instead, copy it to .env and change the values there. The default values will work out of the box as long as you provide your license key.
_LANGSMITH_VERSION=0.1.12
_LANGSMITH_VERSION=0.1.17
LANGSMITH_LICENSE_KEY=your-license-key # Change to your Langsmith license key
OPENAI_API_KEY=your-openai-api-key # Needed for Online Evals and Magic Query features
AUTH_TYPE=none # Set to oauth if you want to use OAuth2.0
Expand All @@ -8,11 +8,5 @@ OAUTH_ISSUER_URL=https://your-issuer-url # Required if AUTH_TYPE=oauth
API_KEY_SALT=super # Change to your desired API key salt. Can be any random value. Must be set if AUTH_TYPE=oauth
POSTGRES_DATABASE_URI=postgres:postgres@langchain-db:5432/postgres # Change to your database URI if using external postgres. Otherwise, leave it as is
REDIS_DATABASE_URI=redis://langchain-redis:6379 # Change to your Redis URI if using external Redis. Otherwise, leave it as is
CLICKHOUSE_HOST=langchain-clickhouse # Change to your ClickHouse host if using external ClickHouse. Otherwise, leave it as is
CLICKHOUSE_PORT=8123 # Change to your ClickHouse port if using external ClickHouse. Otherwise, leave it as is
CLICKHOUSE_USER=default # Change to your ClickHouse user if using external ClickHouse. Otherwise, leave it as is
CLICKHOUSE_PASSWORD=password # Change to your ClickHouse password if using external ClickHouse. Otherwise, leave it as is
CLICKHOUSE_DB=default # Change to your ClickHouse database if using external ClickHouse. Otherwise, leave it as is
CLICKHOUSE_NATIVE_PORT=9000 # Change to your ClickHouse native port if using external ClickHouse. Otherwise, leave it as is
LOG_LEVEL=warning # Change to your desired log level
MAX_ASYNC_JOBS_PER_WORKER=10 # Change to your desired maximum async jobs per worker. We recommend 10/suggest spinning up more replicas of the queue worker if you need more throughput
40 changes: 7 additions & 33 deletions python/langsmith/cli/docker-compose.yaml
@@ -1,11 +1,11 @@
version: "4"
services:
langchain-playground:
image: langchain/langsmith-playground:${_LANGSMITH_IMAGE_VERSION:-0.1.12}
image: langchain/langsmith-playground:${_LANGSMITH_IMAGE_VERSION:-0.1.17}
ports:
- 3001:3001
langchain-frontend:
image: langchain/langsmith-frontend:${_LANGSMITH_IMAGE_VERSION:-0.1.12}
image: langchain/langsmith-frontend:${_LANGSMITH_IMAGE_VERSION:-0.1.17}
environment:
- VITE_BACKEND_AUTH_TYPE=${AUTH_TYPE:-none}
- VITE_OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}
Expand All @@ -17,7 +17,7 @@ services:
- langchain-playground
- langchain-hub
langchain-backend:
image: langchain/langsmith-backend:${_LANGSMITH_IMAGE_VERSION:-0.1.12}
image: langchain/langsmith-backend:${_LANGSMITH_IMAGE_VERSION:-0.1.17}
environment:
- PORT=1984
- LANGCHAIN_ENV=local_docker
Expand All @@ -30,11 +30,6 @@ services:
- API_KEY_SALT=${API_KEY_SALT}
- POSTGRES_DATABASE_URI=${POSTGRES_DATABASE_URI:-postgres:postgres@langchain-db:5432/postgres}
- REDIS_DATABASE_URI=${REDIS_DATABASE_URI:-redis://langchain-redis:6379}
- CLICKHOUSE_DB=${CLICKHOUSE_DB:-default}
- CLICKHOUSE_USER=${CLICKHOUSE_USER:-default}
- CLICKHOUSE_PASSWORD=${CLICKHOUSE_PASSWORD:-password}
- CLICKHOUSE_HOST=${CLICKHOUSE_HOST:-langchain-clickhouse}
- CLICKHOUSE_PORT=${CLICKHOUSE_PORT:-8123}
ports:
- 1984:1984
depends_on:
Expand All @@ -48,7 +43,7 @@ services:
condition: service_completed_successfully
restart: always
langchain-queue:
image: langchain/langsmith-backend:${_LANGSMITH_IMAGE_VERSION:-0.1.12}
image: langchain/langsmith-backend:${_LANGSMITH_IMAGE_VERSION:-0.1.17}
environment:
- PORT=1984
- LANGCHAIN_ENV=local_docker
Expand All @@ -61,11 +56,6 @@ services:
- API_KEY_SALT=${API_KEY_SALT}
- POSTGRES_DATABASE_URI=${POSTGRES_DATABASE_URI:-postgres:postgres@langchain-db:5432/postgres}
- REDIS_DATABASE_URI=${REDIS_DATABASE_URI:-redis://langchain-redis:6379}
- CLICKHOUSE_DB=${CLICKHOUSE_DB:-default}
- CLICKHOUSE_USER=${CLICKHOUSE_USER:-default}
- CLICKHOUSE_PASSWORD=${CLICKHOUSE_PASSWORD:-password}
- CLICKHOUSE_HOST=${CLICKHOUSE_HOST:-langchain-clickhouse}
- CLICKHOUSE_PORT=${CLICKHOUSE_PORT:-8123}
- MAX_ASYNC_JOBS_PER_WORKER=${MAX_ASYNC_JOBS_PER_WORKER:-10}
command:
- "saq"
Expand All @@ -82,7 +72,7 @@ services:
condition: service_completed_successfully
restart: always
langchain-hub:
image: langchain/langhub-backend:${_LANGSMITH_IMAGE_VERSION:-0.1.12}
image: langchain/langhub-backend:${_LANGSMITH_IMAGE_VERSION:-0.1.17}
environment:
- PORT=1985
- LANGCHAIN_ENV=local_docker
Expand All @@ -95,11 +85,6 @@ services:
- API_KEY_SALT=${API_KEY_SALT}
- POSTGRES_DATABASE_URI=${POSTGRES_DATABASE_URI:-postgres:postgres@langchain-db:5432/postgres}
- REDIS_DATABASE_URI=${REDIS_DATABASE_URI:-redis://langchain-redis:6379}
- CLICKHOUSE_DB=${CLICKHOUSE_DB:-default}
- CLICKHOUSE_USER=${CLICKHOUSE_USER:-default}
- CLICKHOUSE_PASSWORD=${CLICKHOUSE_PASSWORD:-password}
- CLICKHOUSE_HOST=${CLICKHOUSE_HOST:-langchain-clickhouse}
- CLICKHOUSE_PORT=${CLICKHOUSE_PORT:-8123}
ports:
- 1985:1985
depends_on:
Expand Down Expand Up @@ -166,7 +151,7 @@ services:
timeout: 2s
retries: 30
clickhouse-setup:
image: langchain/langsmith-backend:${_LANGSMITH_IMAGE_VERSION:-0.1.12}
image: langchain/langsmith-backend:${_LANGSMITH_IMAGE_VERSION:-0.1.17}
depends_on:
langchain-clickhouse:
condition: service_healthy
Expand All @@ -182,19 +167,14 @@ services:
- OAUTH_ISSUER_URL=${OAUTH_ISSUER_URL}
- POSTGRES_DATABASE_URI=${POSTGRES_DATABASE_URI:-postgres:postgres@langchain-db:5432/postgres}
- REDIS_DATABASE_URI=${REDIS_DATABASE_URI:-redis://langchain-redis:6379}
- CLICKHOUSE_DB=${CLICKHOUSE_DB:-default}
- CLICKHOUSE_USER=${CLICKHOUSE_USER:-default}
- CLICKHOUSE_PASSWORD=${CLICKHOUSE_PASSWORD:-password}
- CLICKHOUSE_HOST=${CLICKHOUSE_HOST:-langchain-clickhouse}
- CLICKHOUSE_NATIVE_PORT=${CLICKHOUSE_NATIVE_PORT:-9000}
entrypoint:
[
"bash",
"-c",
"migrate -source file://clickhouse/migrations -database 'clickhouse://langchain-clickhouse:9000?username=default&password=password&database=default&x-multi-statement=true&x-migrations-table-engine=MergeTree' up",
]
postgres-setup:
image: langchain/langsmith-backend:${_LANGSMITH_IMAGE_VERSION:-0.1.12}
image: langchain/langsmith-backend:${_LANGSMITH_IMAGE_VERSION:-0.1.17}
depends_on:
langchain-db:
condition: service_healthy
Expand All @@ -208,12 +188,6 @@ services:
- API_KEY_SALT=${API_KEY_SALT}
- POSTGRES_DATABASE_URI=${POSTGRES_DATABASE_URI:-postgres:postgres@langchain-db:5432/postgres}
- REDIS_DATABASE_URI=${REDIS_DATABASE_URI:-redis://langchain-redis:6379}
- CLICKHOUSE_DB=${CLICKHOUSE_DB:-default}
- CLICKHOUSE_USER=${CLICKHOUSE_USER:-default}
- CLICKHOUSE_PASSWORD=${CLICKHOUSE_PASSWORD:-password}
- CLICKHOUSE_HOST=${CLICKHOUSE_HOST:-langchain-clickhouse}
- CLICKHOUSE_PORT=${CLICKHOUSE_PORT:-8123}
- 'DEFAULT_FEATURE_FLAGS={"run_rules_enabled": true}'
restart: "on-failure:10"
entrypoint:
[
Expand Down
14 changes: 7 additions & 7 deletions python/langsmith/cli/main.py
Expand Up @@ -101,12 +101,12 @@ def _start_local(self) -> None:
def pull(
self,
*,
version: str = "0.1.12",
version: str = "0.1.17",
) -> None:
"""Pull the latest LangSmith images.

Args:
version: The LangSmith version to use for LangSmith. Defaults to 0.1.12
version: The LangSmith version to use for LangSmith. Defaults to 0.1.17
"""
os.environ["_LANGSMITH_IMAGE_VERSION"] = version
subprocess.run(
Expand All @@ -123,7 +123,7 @@ def start(
*,
openai_api_key: Optional[str] = None,
langsmith_license_key: str,
version: str = "0.1.12",
version: str = "0.1.17",
) -> None:
"""Run the LangSmith server locally.

Expand Down Expand Up @@ -251,8 +251,8 @@ def main() -> None:
)
server_start_parser.add_argument(
"--version",
default="0.1.12",
help="The LangSmith version to use for LangSmith. Defaults to 0.1.12.",
default="0.1.17",
help="The LangSmith version to use for LangSmith. Defaults to 0.1.17.",
)
server_start_parser.set_defaults(
func=lambda args: server_command.start(
Expand All @@ -279,8 +279,8 @@ def main() -> None:
)
server_pull_parser.add_argument(
"--version",
default="0.1.12",
help="The LangSmith version to use for LangSmith. Defaults to 0.1.12.",
default="0.1.17",
help="The LangSmith version to use for LangSmith. Defaults to 0.1.17.",
)
server_pull_parser.set_defaults(
func=lambda args: server_command.pull(version=args.version)
Expand Down