Skip to content

Commit

Permalink
Feature/rm core dependency cli (#974)
Browse files Browse the repository at this point in the history
* add group permissions

* fix typo

* rm core dep

* bump

* fixed
  • Loading branch information
emrgnt-cmplxty authored Aug 23, 2024
1 parent 3c06d11 commit 00d6c19
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 40 deletions.
1 change: 0 additions & 1 deletion py/cli/commands/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,6 @@ def serve(
if docker:

run_docker_serve(
client,
host,
port,
exclude_neo4j,
Expand Down
31 changes: 0 additions & 31 deletions py/cli/utils/docker_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import requests
from requests.exceptions import RequestException

from core.main import R2RBuilder, R2RConfig
from sdk import R2RClient


Expand Down Expand Up @@ -102,7 +101,6 @@ def run_local_serve(


def run_docker_serve(
client: R2RClient,
host: str,
port: int,
exclude_neo4j: bool,
Expand All @@ -119,35 +117,6 @@ def run_docker_serve(
if config_path and config_name:
raise ValueError("Cannot specify both config_path and config_name")

if config_path:
config = R2RConfig.from_toml(config_path)
else:
if not config_name:
config_name = "default"
config = R2RConfig.from_toml(R2RBuilder.CONFIG_OPTIONS[config_name])

if "unstructured" in config.parsing.provider and not image:
image = "emrgntcmplxty/r2r-unstructured"

completion_provider = config.completion.provider
completion_model = config.completion.generation_config.model
completion_model_provider = completion_model.split("/")[0]

check_llm_reqs(
completion_provider,
completion_model_provider,
include_ollama=exclude_ollama,
)

embedding_provider = config.embedding.provider
embedding_model = config.embedding.base_model
embedding_model_provider = embedding_model.split("/")[0]
check_llm_reqs(
embedding_provider,
embedding_model_provider,
include_ollama=exclude_ollama,
)

no_conflict, message = check_subnet_conflict()
if not no_conflict:
click.secho(f"Warning: {message}", fg="red", bold=True)
Expand Down
12 changes: 6 additions & 6 deletions py/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion py/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
[tool.poetry]
name = "r2r"
readme = "README.md"
version = "0.3.0"
version = "0.3.01"
description = "SciPhi R2R"
authors = ["Owen Colegrove <[email protected]>"]
license = "MIT"
Expand Down Expand Up @@ -63,6 +63,7 @@ psutil = { version = "^6.0.0", optional = true }
deepdiff = { version = "^7.0.1", optional = true }
graspologic = { version = "^3.4.1", optional = true }
nltk = "^3.9.1"
python-dotenv = "^1.0.1"

[tool.poetry.extras]
core = [
Expand Down
2 changes: 1 addition & 1 deletion py/sdk/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -550,4 +550,4 @@ class Config:
"kg_search_results": None,
},
}
}
}

0 comments on commit 00d6c19

Please sign in to comment.