Skip to content

Commit

Permalink
move to subfolder
Browse files Browse the repository at this point in the history
  • Loading branch information
sfc-gh-pmardziel committed Nov 15, 2024
1 parent fd59fc9 commit c8a296a
Show file tree
Hide file tree
Showing 31 changed files with 826 additions and 734 deletions.
13 changes: 8 additions & 5 deletions examples/experimental/export_dummy_example.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,10 @@
"from trulens.core import Feedback\n",
"from trulens.core import Select\n",
"from trulens.core.session import TruSession\n",
"from trulens.experimental.otel_tracing.core import sem\n",
"from trulens.experimental.otel_tracing.core.trace import trulens_tracer_provider\n",
"from trulens.experimental.otel_tracing.core.trace import sem\n",
"from trulens.experimental.otel_tracing.core.trace.trace import (\n",
" trulens_tracer_provider,\n",
")\n",
"from trulens.feedback.dummy.provider import DummyProvider\n",
"from trulens.semconv.trace import SpanAttributes\n",
"\n",
Expand Down Expand Up @@ -349,7 +351,8 @@
"# The InMemorySpanExporter stores the spans in memory. Lets read them back here\n",
"# to inspect them:\n",
"\n",
"from trulens.experimental.otel_tracing.core import otel as core_otel\n",
"from trulens.experimental.otel_tracing.core.trace import context as core_context\n",
"from trulens.experimental.otel_tracing.core.trace import otel as core_otel\n",
"\n",
"if \"exporter\" in locals():\n",
" print(f\"Spans exported to {exporter}:\")\n",
Expand All @@ -360,9 +363,9 @@
" for span in spans:\n",
" # Using of_contextlike here to print ids more readably.\n",
" print(\n",
" core_otel.SpanContext.of_contextlike(span.context),\n",
" core_context.SpanContext.of_contextlike(span.context),\n",
" \"->\",\n",
" core_otel.SpanContext.of_contextlike(span.parent),\n",
" core_context.SpanContext.of_contextlike(span.parent),\n",
" span.name,\n",
" )\n",
"\n",
Expand Down
81 changes: 40 additions & 41 deletions poetry.lock

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

6 changes: 2 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ classifiers = [
[tool.poetry.dependencies]
python = "^3.8.1,!=3.9.7"
trulens-core = { version = "^1.0.0", extras = [
"otel",
"tqdm",
"openai",
] }
trulens-feedback = { version = "^1.0.0" }
trulens-dashboard = { version = "^1.0.0" }
trulens-semconv = { version = "^1.0.0" }
# Remove after deprecation period:
trulens_eval = { version = "^1.0.0" }

Expand Down Expand Up @@ -67,9 +67,6 @@ mkdocs-gen-files = ">=0.5"
mkdocs-literate-nav = ">=0.6"
mkdocs-section-index = ">=0.3"

[tool.poetry.group.otel.dependencies]
trulens-semconv = { path = "src/semconv", develop = true }

[tool.poetry.group.apps.dependencies]
trulens-apps-langchain = { path = "src/apps/langchain", develop = true }
trulens-apps-llamaindex = { path = "src/apps/llamaindex", develop = true }
Expand All @@ -90,6 +87,7 @@ trulens-connectors-snowflake = { path = "src/connectors/snowflake", develop = tr
trulens-core = { path = "src/core", develop = true }
trulens-feedback = { path = "src/feedback", develop = true }
trulens-dashboard = { path = "src/dashboard", develop = true }
trulens-semconv = { path = "src/semconv", develop = true }
# Remove after deprecation period.
trulens_eval = { path = "src/trulens_eval", develop = true }

Expand Down
6 changes: 3 additions & 3 deletions src/apps/langchain/poetry.lock

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

16 changes: 8 additions & 8 deletions src/apps/llamaindex/poetry.lock

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

6 changes: 3 additions & 3 deletions src/apps/nemo/poetry.lock

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

11 changes: 3 additions & 8 deletions src/core/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,16 @@ alembic = "^1.8.1"
nest-asyncio = "^1.5"
python-dotenv = ">=0.21,<2.0"
importlib-resources = "^6.0"
trulens-semconv = { version = "^1.0.0", optional = true }
opentelemetry-api = { version = "^1.0.0", optional = true }
opentelemetry-sdk = { version = "^1.0.0", optional = true }

[tool.poetry.group.tqdm]
optional = true

[tool.poetry.group.tqdm.dependencies]
tqdm = { version = ">=4.2.0", optional = true }

[tool.poetry.group.otel]
optional = true

[tool.poetry.group.otel.dependencies]
trulens-semconv = { version = "^1.0.0", optional = true }
opentelemetry-api = { version = "^1.0.0", optional = true }
opentelemetry-sdk = { version = "^1.0.0", optional = true }

[tool.poetry.group.dev]
optional = true

Expand Down
8 changes: 6 additions & 2 deletions src/core/trulens/_mods.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
"""

from core.trulens.experimental.otel_tracing.core.trace import (
trace as core_trace,
)
from core.trulens.experimental.otel_tracing.core.trace.trace import (
otel as core_otel,
)
from trulens.apps import basic as basic_app
from trulens.apps import custom as custom_app
from trulens.apps import virtual as virtual_app
Expand Down Expand Up @@ -77,8 +83,6 @@
from trulens.dashboard.utils import records_utils
from trulens.dashboard.ux import components as dashboard_components
from trulens.dashboard.ux import styles as dashboard_styles
from trulens.experimental.otel_tracing.core import otel as core_otel
from trulens.experimental.otel_tracing.core import trace as core_trace
from trulens.experimental.otel_tracing.core._utils import wrap as wrap_utils
from trulens.feedback import embeddings as feedback_embeddings
from trulens.feedback import feedback as mod_feedback
Expand Down
2 changes: 1 addition & 1 deletion src/core/trulens/core/schema/record.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ def _validate_experimental_otel_spans(cls, spans: List[Any]) -> List[Any]:

if len(spans) > 0:
if otel_tracing_feature._FeatureSetup.are_optionals_installed():
from trulens.experimental.otel_tracing.core import (
from trulens.experimental.otel_tracing.core.trace import (
sem as core_sem,
)

Expand Down
Loading

0 comments on commit c8a296a

Please sign in to comment.