Skip to content

chore: merge main into develop to resolve PR #15 conflicts#16

Merged
LukasWodka merged 35 commits into
developfrom
fix/pr-15-conflicts
May 19, 2026
Merged

chore: merge main into develop to resolve PR #15 conflicts#16
LukasWodka merged 35 commits into
developfrom
fix/pr-15-conflicts

Conversation

@saadqbal

@saadqbal saadqbal commented May 15, 2026

Copy link
Copy Markdown
Collaborator

Summary

PR #14 was squash-merged into develop, so main's older history isn't recorded as merged in. Opening PR #15 (develop → main) therefore shows conflicts in README.md, notebooks/traceblocTrainingGuide.ipynb, and notebooks/GenerateCheckWeights.ipynb.

This PR merges main into develop and resolves all three conflicts by keeping develop's content (canonical 0.8.x notebooks, GitHub-backed Colab URL, all the cleanup from #14). Net working-tree diff against develop is empty — only the merge commit itself is added.

Once this lands, PR #15 will be mergeable cleanly.

Test plan

🤖 Generated with Claude Code


Note

Low Risk
No functional/code changes are introduced; this is a merge/conflict-resolution PR, so risk is limited to potential unintended file-content drift during conflict resolution.

Overview
Merges main into develop to clear merge conflicts blocking the develop → main PR, resolving conflicts by keeping the existing develop versions (notably README.md and the two notebooks).

Net result is a merge commit only with no intended working-tree changes relative to develop.

Reviewed by Cursor Bugbot for commit 02db887. Bugbot is set up for automated code reviews on this repo. Configure here.

divyasinghds and others added 30 commits September 16, 2025 11:09
* added files

* improvements

* improvements

* license updated

* license updated

* Update LICENSE
The GitHub notebook was outdated — minimal instructions, links to
GitLab (should be GitHub), no prerequisites, no troubleshooting,
no model zoo table, no expected outputs.

Updated to mirror the Colab notebook with:
- Prerequisites checklist with signup/join links
- Model zoo task table with all 9 task types and frameworks
- Option A (model zoo) / Option B (own model) structure
- Dataset ID instructions (where to find it)
- Available training commands table
- Expected outputs and troubleshooting for each step
- "What happens next" section (monitoring, leaderboard, compare)
- Links to docs, support, Discord

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Update training notebook to match Colab quickstart
Aligns with the optional-dependency-groups change shipping in
tracebloc-py-package 0.6.33. Default install no longer bundles every
ML framework — users pick the extra that matches their setup.

- README.md: 3-line extras table in the local-setup section.
- notebooks/traceblocTrainingGuide.ipynb cell 3: switch install cmd to
  [pytorch] as the most common setup; comment points at [tensorflow]
  and [all].

DO NOT MERGE until tracebloc_package 0.6.33 is live on real PyPI.
Currently 0.6.33 is only on TestPyPI.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Builds on top of the install-extras change (eeae340) and broadens scope
for the upcoming tracebloc_package 0.7.0 release.

Notebook changes (notebooks/traceblocTrainingGuide.ipynb):
- Cell 3 install pin: >=0.6.33 -> >=0.7.0
- Cell 11: user.uploadModel(MODEL_PATH) -> user.upload_model(MODEL_PATH)
- Cell 12 (markdown docs example): same uploadModel rename
- Cell 14: user.linkModelDataset(DATASET_ID) -> user.link_model_dataset(DATASET_ID)
- Cell 16 (reference table): experimentName, learningRate, getTrainingPlan,
  resetTrainingPlan -> experiment_name, learning_rate, get_training_plan,
  reset_training_plan
- Cell 17: experimentName + getTrainingPlan call sites updated

README.md: pip install lines bumped from >=0.6.33 to >=0.7.0 across all
three extras (pytorch, tensorflow, all).

Static rewrite only; the notebook was not executed (requires real
workspace credentials). All deprecated symbols touched here have
deprecation aliases on the Python side, so callers using the old names
would still work but emit DeprecationWarning.

Supersedes #4 (which was scoped only to the 0.6.33 install-extras
migration). The 0.6.33 release path is being collapsed into 0.7.0 now
that SDK.2/3 work has landed on develop, so this PR ships both changes
together.

Cannot merge until tracebloc_package 0.7.0 is published to real PyPI —
same merge-coordination block as #4.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
aptracebloc and others added 5 commits May 11, 2026 17:05
notebook API renames + install pin bump for tracebloc_package 0.7.0
The SDK was renamed in tracebloc/tracebloc-py-package#135. `tracebloc==0.8.1`
is live on PyPI. Notebooks and docs here still pointed at the old
`tracebloc_package` name.

- Install cells / commands: `tracebloc_package[X]>=0.7.0` -> `tracebloc[X]>=0.8.0`.
- Import cells: `from tracebloc_package import ...` -> `from tracebloc import ...`.
- README links the new PyPI page (`tracebloc`, not `tracebloc-package`).
- CLAUDE.md notes the historical name and the metadata-only redirect that
  keeps `pip install tracebloc_package` working for old notebooks.

Old name keeps working in 0.8.x via the compat shim (with
DeprecationWarning) and the redirect distribution on PyPI; this PR
moves the canonical examples to the new name.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
* docs: migrate notebooks to tracebloc 0.8.x (closes #11)

The SDK was renamed in tracebloc/tracebloc-py-package#135. `tracebloc==0.8.1`
is live on PyPI. Notebooks and docs here still pointed at the old
`tracebloc_package` name.

- Install cells / commands: `tracebloc_package[X]>=0.7.0` -> `tracebloc[X]>=0.8.0`.
- Import cells: `from tracebloc_package import ...` -> `from tracebloc import ...`.
- README links the new PyPI page (`tracebloc`, not `tracebloc-package`).
- CLAUDE.md notes the historical name and the metadata-only redirect that
  keeps `pip install tracebloc_package` working for old notebooks.

Old name keeps working in 0.8.x via the compat shim (with
DeprecationWarning) and the redirect distribution on PyPI; this PR
moves the canonical examples to the new name.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

* docs: bump install pin to 0.8.1 (latest)

---------

Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
# Conflicts:
#	README.md
#	notebooks/GenerateCheckWeights.ipynb
#	notebooks/traceblocTrainingGuide.ipynb
@saadqbal saadqbal self-assigned this May 15, 2026
@divyasinghds divyasinghds self-requested a review May 15, 2026 08:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants