Merge remote-tracking branch 'upstream/main' into load_model_path

VowpalWabbit · Jul 25, 2023 · 65d9a0c · 65d9a0c
2 parents 84d4869 + 89c4424
commit 65d9a0c
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 6 deletions.
diff --git a/docs/source/vw_versions.md b/docs/source/vw_versions.md
@@ -15,3 +15,4 @@ The package also exports both the VW version and commit used which can be read u
 | `0.4.0` | `9.8.0` | [`4715756`](https://github.com/VowpalWabbit/vowpal_wabbit/commits/4715756) |
 | `0.4.1` | `9.8.0` | [`b8c4ee3`](https://github.com/VowpalWabbit/vowpal_wabbit/commits/b8c4ee3) |
 | `0.5.0` | `9.8.0` | [`b8c4ee3`](https://github.com/VowpalWabbit/vowpal_wabbit/commits/b8c4ee3) |
+| `0.6.0` | `9.9.0` | [`9db1f5f`](https://github.com/VowpalWabbit/vowpal_wabbit/commits/9db1f5f) |
diff --git a/ext_libs/vowpal_wabbit b/ext_libs/vowpal_wabbit
diff --git a/src/cpp/main.cpp b/src/cpp/main.cpp
@@ -532,6 +532,9 @@ void py_unsetup_example(VW::workspace& ws, VW::example& ex)
     case VW::label_type_t::CB:
       replacement.cb = std::move(ex.l.cb);
       break;
+    case VW::label_type_t::CB_WITH_OBSERVATIONS:
+      replacement.cb_with_observations = std::move(ex.l.cb_with_observations);
+      break;
     case VW::label_type_t::CB_EVAL:
       replacement.cb_eval = std::move(ex.l.cb_eval);
       break;
@@ -890,6 +893,7 @@ PYBIND11_MODULE(_core, m)
       .value("Simple", VW::label_type_t::SIMPLE)
       .value("CB", VW::label_type_t::CB)
       .value("CBEval", VW::label_type_t::CB_EVAL)
+      .value("CBWithObservations", VW::label_type_t::CB_WITH_OBSERVATIONS)
       .value("CS", VW::label_type_t::CS)
       .value("Multilabel", VW::label_type_t::MULTILABEL)
       .value("Multiclass", VW::label_type_t::MULTICLASS)

diff --git a/src/vowpal_wabbit_next/_core.pyi b/src/vowpal_wabbit_next/_core.pyi
@@ -340,6 +340,7 @@ class LabelType():
         """
     CB: vowpal_wabbit_next._core.LabelType # value = <LabelType.CB: 1>
     CBEval: vowpal_wabbit_next._core.LabelType # value = <LabelType.CBEval: 2>
+    CBWithObservations: vowpal_wabbit_next._core.LabelType # value = <LabelType.CBWithObservations: 3>
     CCB: vowpal_wabbit_next._core.LabelType # value = <LabelType.CCB: 7>
     CS: vowpal_wabbit_next._core.LabelType # value = <LabelType.CS: 4>
     Continuous: vowpal_wabbit_next._core.LabelType # value = <LabelType.Continuous: 10>
@@ -348,7 +349,7 @@ class LabelType():
     NoLabel: vowpal_wabbit_next._core.LabelType # value = <LabelType.NoLabel: 9>
     Simple: vowpal_wabbit_next._core.LabelType # value = <LabelType.Simple: 0>
     Slates: vowpal_wabbit_next._core.LabelType # value = <LabelType.Slates: 8>
-    __members__: dict # value = {'Simple': <LabelType.Simple: 0>, 'CB': <LabelType.CB: 1>, 'CBEval': <LabelType.CBEval: 2>, 'CS': <LabelType.CS: 4>, 'Multilabel': <LabelType.Multilabel: 5>, 'Multiclass': <LabelType.Multiclass: 6>, 'CCB': <LabelType.CCB: 7>, 'Slates': <LabelType.Slates: 8>, 'NoLabel': <LabelType.NoLabel: 9>, 'Continuous': <LabelType.Continuous: 10>}
+    __members__: dict # value = {'Simple': <LabelType.Simple: 0>, 'CB': <LabelType.CB: 1>, 'CBEval': <LabelType.CBEval: 2>, 'CBWithObservations': <LabelType.CBWithObservations: 3>, 'CS': <LabelType.CS: 4>, 'Multilabel': <LabelType.Multilabel: 5>, 'Multiclass': <LabelType.Multiclass: 6>, 'CCB': <LabelType.CCB: 7>, 'Slates': <LabelType.Slates: 8>, 'NoLabel': <LabelType.NoLabel: 9>, 'Continuous': <LabelType.Continuous: 10>}
     pass
 class ModelDelta():
     def __init__(self, model_data: bytes) -> None: ...
@@ -514,6 +515,6 @@ def _write_cache_example(workspace: Workspace, example: Example, file: object) -
     pass
 def _write_cache_header(workspace: Workspace, file: object) -> None:
     pass
-__version__ = '0.5.0'
-_vw_commit = 'b8c4ee3'
-_vw_version = '9.8.0'
+__version__ = '0.6.0'
+_vw_commit = '9db1f5f'
+_vw_version = '9.9.0'
diff --git a/tests/test_learn.py b/tests/test_learn.py
@@ -72,3 +72,26 @@ def test_oaa_learn_crash():
 
     for line in dataset:
         workspace.learn_one(parser.parse_line(line))
+
+
+def test_igl_predict_and_learn():
+    dsjson_input = """{"_label_cost": 0, "_label_probability": 0.25, "_label_Action": 1, "_labelIndex": 0, "o": [{"v": {"v=click": 1}, "_definitely_bad": false}], "a": [0, 1, 2, 3], "c": {"User": {"user=Tom": 1, "time=afternoon" : 1}, "_multi": [{"Action": {"action=politics": 1}}, {"Action": {"action=sports": 1}}, {"Action": {"action=music": 1}}, {"Action": {"action=food": 1}}]}, "p": [0.25, 0.25, 0.25, 0.25]}"""
+    model = vw.Workspace(
+        ["--cb_explore_adf", "--coin", "--experimental_igl", "-q", "UA"]
+    )
+
+    parser = vw.DSJsonFormatParser(model)
+    examples = parser.parse_json(dsjson_input)
+
+    assert len(examples) == 6
+
+    pred = model.predict_one(examples)
+    assert all([p == 0.25 for _, p in pred])
+    model.learn_one(examples)
+
+    assert (
+        model.weights()[
+            model.get_index_for_scalar_feature("user=Tom", namespace_name="User")
+        ][0][0]
+        != 0
+    )
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.5.0
+0.6.0