bbqsearch 0.1.0__tar.gz

bbqsearch-0.1.0/PKG-INFO

@@ -0,0 +1,25 @@
+Metadata-Version: 2.4
+Name: bbqsearch
+Version: 0.1.0
+Summary: General configurable queue-based search algorithm for teaching AI.
+Author-email: Brandon Bennett <B.Bennett@leeds.ac.uk>
+License: MIT
+Keywords: search,teaching
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+
+# bbqsearch
+
+`bbqsearch` is a simple, configurable, queue-based search algorithm intended for AI teaching.
+
+**Status:** Experimental research and teaching tool.
+
+The package is designed primarily for use in interactive environments such as a Jupyter notebook 
+or in Google Colab, providing a simple interface for running Prover9 from Python
+code and capturing the resulting proofs and diagnostic output.
+
+## Installation
+
+```bash
+pip install bbqsearch
+```

bbqsearch-0.1.0/README.md

@@ -0,0 +1,15 @@
+# bbqsearch
+
+`bbqsearch` is a simple, configurable, queue-based search algorithm intended for AI teaching.
+
+**Status:** Experimental research and teaching tool.
+
+The package is designed primarily for use in interactive environments such as a Jupyter notebook 
+or in Google Colab, providing a simple interface for running Prover9 from Python
+code and capturing the resulting proofs and diagnostic output.
+
+## Installation
+
+```bash
+pip install bbqsearch
+```

bbqsearch-0.1.0/RepoMan_bbqsearch.ipynb

@@ -0,0 +1 @@
+{"nbformat":4,"nbformat_minor":0,"metadata":{"colab":{"provenance":[],"authorship_tag":"ABX9TyMzK0ndZg+myb/pzl53iGjZ"},"kernelspec":{"name":"python3","display_name":"Python 3"},"language_info":{"name":"python"}},"cells":[{"cell_type":"markdown","source":["# `RepoMan_bbSearch.ipynb`\n","\n","Related resources:\n","* For top level Repo index and info go to:\n","[`RepoIndex.ipynb`](https://colab.research.google.com/drive/1aSzYWUuAKR12p43tO8-CWQl4WtOE-937)\n","\n","* The repo code of `bbpylib` can be found in:  [`repo.ipynb`](https://colab.research.google.com/drive/1YEkkaKQkipno6S8YxoeBhOmnkfqLiK9X)\n"],"metadata":{"id":"ksTZYWNXBFC0"}},{"cell_type":"code","execution_count":16,"metadata":{"colab":{"base_uri":"https://localhost:8080/"},"id":"N4R7lz3jAxrO","executionInfo":{"status":"ok","timestamp":1779816883237,"user_tz":-60,"elapsed":4527,"user":{"displayName":"Brandon Bennett","userId":"09986949895077581770"}},"outputId":"594e6e3b-a173-4ce4-8997-b0076d2ad34b"},"outputs":[{"output_type":"stream","name":"stdout","text":["Requirement already satisfied: bbpylib in /usr/local/lib/python3.12/dist-packages (0.1.30)\n"]}],"source":["!pip install --upgrade bbpylib\n","from bbpylib.colab import require_gdrive\n","from bbpylib.repo import Repo\n","from bbpylib.colab.tools import save_this_cell\n","\n","import os\n","from pathlib import Path\n","require_gdrive()"]},{"cell_type":"code","source":["REPO_ROOT = Path(\"/content/drive/MyDrive/GIT-repos\")\n","\n","import subprocess\n","import requests\n","import re\n","\n","from google.colab import userdata\n","\n","def run_command(cmd, *, cwd=None, env=None, check=True):\n","    r = subprocess.run( cmd,\n","                        cwd=cwd, env=env,\n","                        text=True, capture_output=True )\n","    if r.stdout: print(r.stdout, end=\"\")\n","    if r.stderr: print(r.stderr, end=\"\")\n","    if check and r.returncode:\n","        raise subprocess.CalledProcessError(\n","            r.returncode, r.args, r.stdout, r.stderr)\n","    return r\n","\n","def published_pip_version(package) -> str | None:\n","      url = f\"https://pypi.org/pypi/{package}/json\"\n","      r = requests.get(url, timeout=5)\n","      if r.status_code != 200:\n","          return None  # package not found or network error\n","      data = r.json()\n","      # 'info' is the metadata for the *latest* release\n","      return data.get(\"info\", {}).get(\"version\")\n","\n","def upload_pip( package, new_version, repo_root=REPO_ROOT ):\n","      path = str( Path(repo_root)/ package )\n","      print(f\"Uploading {package} new version {new_version} to PyPi ...\" )\n","      pip_api_token= userdata.get(\"PIP_API_TOKEN\")\n","      env = os.environ.copy()\n","      env[\"TWINE_USERNAME\"] = \"__token__\"\n","      env[\"TWINE_PASSWORD\"] = pip_api_token\n","      run_command( [\"pip\", \"-q\", \"install\", \"twine\"], check=True)\n","      run_command( [\"twine\", \"upload\", \"--verbose\", \"dist/*\"], cwd=path, env=env, check=True)\n","\n","#published_pip_version(\"pyprover9\")\n","\n","upload_pip(\"bbqsearch\", \"0.0.1\")\n"],"metadata":{"colab":{"base_uri":"https://localhost:8080/","height":981},"id":"tIOj7Ab9CeNg","executionInfo":{"status":"error","timestamp":1779814234956,"user_tz":-60,"elapsed":8445,"user":{"displayName":"Brandon Bennett","userId":"09986949895077581770"}},"outputId":"6a8a837a-e04e-4c87-bc17-44c124832e83"},"execution_count":5,"outputs":[{"output_type":"stream","name":"stdout","text":["Uploading bbSearch new version 0.0.1 to PyPi ...\n","   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 42.7/42.7 kB 1.7 MB/s eta 0:00:00\n","   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 807.0/807.0 kB 16.7 MB/s eta 0:00:00\n","Uploading distributions to https://upload.pypi.org/legacy/\n","\u001b[34mINFO    \u001b[0m dist/bbsearch-0.0.1-py3-none-any.whl (6.7 KB)                          \n","\u001b[34mINFO    \u001b[0m dist/bbsearch-0.0.1.tar.gz (8.8 KB)                                    \n","\u001b[34mINFO    \u001b[0m username set by command options                                        \n","\u001b[34mINFO    \u001b[0m password set by command options                                        \n","\u001b[34mINFO    \u001b[0m username: __token__                                                    \n","\u001b[34mINFO    \u001b[0m password: <hidden>                                                     \n","Uploading bbsearch-0.0.1-py3-none-any.whl\n","\u001b[?25l\n","\u001b[2K\u001b[35m  0%\u001b[0m \u001b[90m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\u001b[0m \u001b[32m0.0/9.3 kB\u001b[0m • \u001b[36m--:--\u001b[0m • \u001b[31m?\u001b[0m\n","\u001b[2K\u001b[35m100%\u001b[0m \u001b[90m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\u001b[0m \u001b[32m9.3/9.3 kB\u001b[0m • \u001b[33m00:00\u001b[0m • \u001b[31m?\u001b[0m\n","\u001b[2K\u001b[35m100%\u001b[0m \u001b[90m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\u001b[0m \u001b[32m9.3/9.3 kB\u001b[0m • \u001b[33m00:00\u001b[0m • \u001b[31m?\u001b[0m\n","\u001b[?25h\u001b[34mINFO    \u001b[0m Response from https://upload.pypi.org/legacy/:                         \n","         403 Forbidden                                                          \n","\u001b[34mINFO    \u001b[0m <html>                                                                 \n","          <head>                                                                \n","           <title>403 The user 'brandonb' isn't allowed to upload to project    \n","         'bbsearch'. See https://pypi.org/help/#project-name for more           \n","         information.</title>                                                   \n","          </head>                                                               \n","          <body>                                                                \n","           <h1>403 The user 'brandonb' isn't allowed to upload to project       \n","         'bbsearch'. See https://pypi.org/help/#project-name for more           \n","         information.</h1>                                                      \n","           Access was denied to this resource.<br/><br/>                        \n","         The user &#x27;brandonb&#x27; isn&#x27;t allowed to upload to project  \n","         &#x27;bbsearch&#x27;. See https://pypi.org/help/#project-name for more \n","         information.                                                           \n","                                                                                \n","                                                                                \n","          </body>                                                               \n","         </html>                                                                \n","\u001b[31mERROR   \u001b[0m HTTPError: 403 Forbidden from https://upload.pypi.org/legacy/          \n","         Forbidden                                                              \n"]},{"output_type":"error","ename":"CalledProcessError","evalue":"Command '['twine', 'upload', '--verbose', 'dist/*']' returned non-zero exit status 1.","traceback":["\u001b[0;31m---------------------------------------------------------------------------\u001b[0m","\u001b[0;31mCalledProcessError\u001b[0m                        Traceback (most recent call last)","\u001b[0;32m/tmp/ipykernel_6935/57094460.py\u001b[0m in \u001b[0;36m<cell line: 0>\u001b[0;34m()\u001b[0m\n\u001b[1;32m     39\u001b[0m \u001b[0;31m#published_pip_version(\"pyprover9\")\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m     40\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m---> 41\u001b[0;31m \u001b[0mupload_pip\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m\"bbSearch\"\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m\"0.0.1\"\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m","\u001b[0;32m/tmp/ipykernel_6935/57094460.py\u001b[0m in \u001b[0;36mupload_pip\u001b[0;34m(package, new_version, repo_root)\u001b[0m\n\u001b[1;32m     35\u001b[0m       \u001b[0menv\u001b[0m\u001b[0;34m[\u001b[0m\u001b[0;34m\"TWINE_PASSWORD\"\u001b[0m\u001b[0;34m]\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mpip_api_token\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m     36\u001b[0m       \u001b[0mrun_command\u001b[0m\u001b[0;34m(\u001b[0m \u001b[0;34m[\u001b[0m\u001b[0;34m\"pip\"\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m\"-q\"\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m\"install\"\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m\"twine\"\u001b[0m\u001b[0;34m]\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mcheck\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0;32mTrue\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m---> 37\u001b[0;31m       \u001b[0mrun_command\u001b[0m\u001b[0;34m(\u001b[0m \u001b[0;34m[\u001b[0m\u001b[0;34m\"twine\"\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m\"upload\"\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m\"--verbose\"\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m\"dist/*\"\u001b[0m\u001b[0;34m]\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mcwd\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0mpath\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0menv\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0menv\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mcheck\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0;32mTrue\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m     38\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m     39\u001b[0m \u001b[0;31m#published_pip_version(\"pyprover9\")\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n","\u001b[0;32m/tmp/ipykernel_6935/57094460.py\u001b[0m in \u001b[0;36mrun_command\u001b[0;34m(cmd, cwd, env, check)\u001b[0m\n\u001b[1;32m     14\u001b[0m     \u001b[0;32mif\u001b[0m \u001b[0mr\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mstderr\u001b[0m\u001b[0;34m:\u001b[0m \u001b[0mprint\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mr\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mstderr\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mend\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0;34m\"\"\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m     15\u001b[0m     \u001b[0;32mif\u001b[0m \u001b[0mcheck\u001b[0m \u001b[0;32mand\u001b[0m \u001b[0mr\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mreturncode\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m---> 16\u001b[0;31m         raise subprocess.CalledProcessError(\n\u001b[0m\u001b[1;32m     17\u001b[0m             r.returncode, r.args, r.stdout, r.stderr)\n\u001b[1;32m     18\u001b[0m     \u001b[0;32mreturn\u001b[0m \u001b[0mr\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n","\u001b[0;31mCalledProcessError\u001b[0m: Command '['twine', 'upload', '--verbose', 'dist/*']' returned non-zero exit status 1."]}]},{"cell_type":"code","source":["GIT_repos_PATH = Path(\"/content/drive/MyDrive/GIT-repos\")\n","\n","repo = Repo(\"bbqsearch\", GIT_repos_PATH, \"BrandonBennett99\")\n","repo.update_pip()"],"metadata":{"colab":{"base_uri":"https://localhost:8080/","height":321},"id":"Ql7ElUmiEI5A","executionInfo":{"status":"error","timestamp":1779816995293,"user_tz":-60,"elapsed":149,"user":{"displayName":"Brandon Bennett","userId":"09986949895077581770"}},"outputId":"68fa0637-9d5f-4b6c-a0dd-c7bfc8dfc2e7"},"execution_count":20,"outputs":[{"output_type":"error","ename":"AttributeError","evalue":"'NoneType' object has no attribute 'split'","traceback":["\u001b[0;31m---------------------------------------------------------------------------\u001b[0m","\u001b[0;31mAttributeError\u001b[0m                            Traceback (most recent call last)","\u001b[0;32m/tmp/ipykernel_6935/3450594270.py\u001b[0m in \u001b[0;36m<cell line: 0>\u001b[0;34m()\u001b[0m\n\u001b[1;32m      2\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m      3\u001b[0m \u001b[0mrepo\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mRepo\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m\"bbqsearch\"\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mGIT_repos_PATH\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m\"BrandonBennett99\"\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 4\u001b[0;31m \u001b[0mrepo\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mupdate_pip\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m","\u001b[0;32m/usr/local/lib/python3.12/dist-packages/bbpylib/repo.py\u001b[0m in \u001b[0;36mupdate_pip\u001b[0;34m(self)\u001b[0m\n\u001b[1;32m     95\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m     96\u001b[0m   \u001b[0;32mdef\u001b[0m \u001b[0mupdate_pip\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mself\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m---> 97\u001b[0;31m       \u001b[0mself\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mincrement_pip_version\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m     98\u001b[0m       \u001b[0mself\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mbuild_pip\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m     99\u001b[0m       \u001b[0mself\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mupload_pip\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n","\u001b[0;32m/usr/local/lib/python3.12/dist-packages/bbpylib/repo.py\u001b[0m in \u001b[0;36mincrement_pip_version\u001b[0;34m(self, part)\u001b[0m\n\u001b[1;32m     64\u001b[0m   \u001b[0;32mdef\u001b[0m \u001b[0mincrement_pip_version\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mself\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mpart\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0;34m\"patch\"\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m     65\u001b[0m       \u001b[0mv\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mself\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mpublished_pip_version\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m---> 66\u001b[0;31m       \u001b[0mnv\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mbump_version\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mv\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mpart\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0mpart\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m     67\u001b[0m       \u001b[0mprint\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m\"Incrementing pip version:\"\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mv\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m\"->\"\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mnv\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m     68\u001b[0m       \u001b[0mself\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mset_version\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mnv\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n","\u001b[0;32m/usr/local/lib/python3.12/dist-packages/bbpylib/repo.py\u001b[0m in \u001b[0;36mbump_version\u001b[0;34m(v, part)\u001b[0m\n\u001b[1;32m    105\u001b[0m \u001b[0;31m# This is just a str->str function so not in the class\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m    106\u001b[0m \u001b[0;32mdef\u001b[0m \u001b[0mbump_version\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mv\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mpart\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0;34m\"patch\"\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m--> 107\u001b[0;31m     \u001b[0mmajor\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mminor\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mpatch\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mmap\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mint\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mv\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0msplit\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m\".\"\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m    108\u001b[0m     \u001b[0;32mif\u001b[0m \u001b[0mpart\u001b[0m \u001b[0;34m==\u001b[0m \u001b[0;34m\"major\"\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m    109\u001b[0m         \u001b[0;32mreturn\u001b[0m \u001b[0;34mf\"{major + 1}.0.0\"\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n","\u001b[0;31mAttributeError\u001b[0m: 'NoneType' object has no attribute 'split'"]}]},{"cell_type":"code","source":["%%shell\n","cd /content/drive/MyDrive/GIT-repos/bbqsearch\n","ls\n","#python -m twine upload dist/* --verbose\n","twine upload --repository testpypi dist/*"],"metadata":{"colab":{"base_uri":"https://localhost:8080/","height":495},"id":"l6ZEnM7pMDmi","executionInfo":{"status":"error","timestamp":1779816960033,"user_tz":-60,"elapsed":1532,"user":{"displayName":"Brandon Bennett","userId":"09986949895077581770"}},"outputId":"1598587c-1191-4a39-8292-357db7c4d53e"},"execution_count":19,"outputs":[{"output_type":"stream","name":"stdout","text":["dist  pyproject.toml  README.md  RepoMan_bbqsearch.ipynb  src\n","Uploading distributions to https://test.pypi.org/legacy/\n","\u001b[31mERROR   \u001b[0m TrustedPublishingFailure: Unable to retrieve an OIDC token from the CI \n","         platform for trusted publishing GCP: OIDC token request failed         \n","         (code=404, body='')                                                    \n"]},{"output_type":"error","ename":"CalledProcessError","evalue":"Command 'cd /content/drive/MyDrive/GIT-repos/bbqsearch\nls\n#python -m twine upload dist/* --verbose\ntwine upload --repository testpypi dist/*\n' returned non-zero exit status 1.","traceback":["\u001b[0;31m---------------------------------------------------------------------------\u001b[0m","\u001b[0;31mCalledProcessError\u001b[0m                        Traceback (most recent call last)","\u001b[0;32m/tmp/ipykernel_6935/1524148870.py\u001b[0m in \u001b[0;36m<cell line: 0>\u001b[0;34m()\u001b[0m\n\u001b[0;32m----> 1\u001b[0;31m \u001b[0mget_ipython\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mrun_cell_magic\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m'shell'\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m''\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m'cd /content/drive/MyDrive/GIT-repos/bbqsearch\\nls\\n#python -m twine upload dist/* --verbose\\ntwine upload --repository testpypi dist/*\\n'\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m","\u001b[0;32m/usr/local/lib/python3.12/dist-packages/google/colab/_shell.py\u001b[0m in \u001b[0;36mrun_cell_magic\u001b[0;34m(self, magic_name, line, cell)\u001b[0m\n\u001b[1;32m    221\u001b[0m     \u001b[0;32mif\u001b[0m \u001b[0mline\u001b[0m \u001b[0;32mand\u001b[0m \u001b[0;32mnot\u001b[0m \u001b[0mcell\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m    222\u001b[0m       \u001b[0mcell\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0;34m' '\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m--> 223\u001b[0;31m     \u001b[0;32mreturn\u001b[0m \u001b[0msuper\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mrun_cell_magic\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mmagic_name\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mline\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mcell\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m    224\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m    225\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n","\u001b[0;32m/usr/local/lib/python3.12/dist-packages/IPython/core/interactiveshell.py\u001b[0m in \u001b[0;36mrun_cell_magic\u001b[0;34m(self, magic_name, line, cell)\u001b[0m\n\u001b[1;32m   2471\u001b[0m             \u001b[0;32mwith\u001b[0m \u001b[0mself\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mbuiltin_trap\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m   2472\u001b[0m                 \u001b[0margs\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0;34m(\u001b[0m\u001b[0mmagic_arg_s\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mcell\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m-> 2473\u001b[0;31m                 \u001b[0mresult\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mfn\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m*\u001b[0m\u001b[0margs\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m**\u001b[0m\u001b[0mkwargs\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m   2474\u001b[0m             \u001b[0;32mreturn\u001b[0m \u001b[0mresult\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m   2475\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n","\u001b[0;32m/usr/local/lib/python3.12/dist-packages/google/colab/_system_commands.py\u001b[0m in \u001b[0;36m_shell_cell_magic\u001b[0;34m(args, cmd)\u001b[0m\n\u001b[1;32m    110\u001b[0m   \u001b[0mresult\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0m_run_command\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mcmd\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mclear_streamed_output\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0;32mFalse\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m    111\u001b[0m   \u001b[0;32mif\u001b[0m \u001b[0;32mnot\u001b[0m \u001b[0mparsed_args\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mignore_errors\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m--> 112\u001b[0;31m     \u001b[0mresult\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mcheck_returncode\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m    113\u001b[0m   \u001b[0;32mreturn\u001b[0m \u001b[0mresult\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m    114\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n","\u001b[0;32m/usr/local/lib/python3.12/dist-packages/google/colab/_system_commands.py\u001b[0m in \u001b[0;36mcheck_returncode\u001b[0;34m(self)\u001b[0m\n\u001b[1;32m    135\u001b[0m   \u001b[0;32mdef\u001b[0m \u001b[0mcheck_returncode\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mself\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m    136\u001b[0m     \u001b[0;32mif\u001b[0m \u001b[0mself\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mreturncode\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m--> 137\u001b[0;31m       raise subprocess.CalledProcessError(\n\u001b[0m\u001b[1;32m    138\u001b[0m           \u001b[0mreturncode\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0mself\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mreturncode\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mcmd\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0mself\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0margs\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0moutput\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0mself\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0moutput\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m    139\u001b[0m       )\n","\u001b[0;31mCalledProcessError\u001b[0m: Command 'cd /content/drive/MyDrive/GIT-repos/bbqsearch\nls\n#python -m twine upload dist/* --verbose\ntwine upload --repository testpypi dist/*\n' returned non-zero exit status 1."]}]},{"cell_type":"code","source":["%%writefile /content/drive/MyDrive/GIT-repos/bbqsearch/pyproject.toml\n","[build-system]\n","requires = [\"hatchling>=1.25\"]\n","build-backend = \"hatchling.build\"\n","\n","[project]\n","name = \"bbqsearch\"\n","version = \"0.1.0\"\n","description = \"General configurable queue-based search algorithm for teaching AI.\"\n","readme = \"README.md\"\n","requires-python = \">=3.8\"\n","license = { text = \"MIT\" }\n","keywords = [\"search\", \"teaching\"]\n","\n","authors = [\n","  { name = \"Brandon Bennett\", email=\"B.Bennett@leeds.ac.uk\" }\n","]\n","\n","#[project.urls]\n","#Homepage = \"https://github.com/...\"\n","#Repository = \"https://github.com/...\"\n","\n","[tool.hatch.build]\n","dev-mode-dirs = [\"src\"]\n","\n","[tool.hatch.build.targets.wheel]\n","#sources = [\"src\"]\n","packages = [\"src/bbqsearch\"]"],"metadata":{"colab":{"base_uri":"https://localhost:8080/"},"id":"2oLSMMg4FS1e","executionInfo":{"status":"ok","timestamp":1779816940386,"user_tz":-60,"elapsed":14,"user":{"displayName":"Brandon Bennett","userId":"09986949895077581770"}},"outputId":"ed92bf9e-06d3-4640-c092-909e37070473"},"execution_count":18,"outputs":[{"output_type":"stream","name":"stdout","text":["Overwriting /content/drive/MyDrive/GIT-repos/bbqsearch/pyproject.toml\n"]}]},{"cell_type":"code","source":["%%writefile /content/drive/MyDrive/GIT-repos/bbqsearch/src/bbqsearch/__init__.py\n","from .bbqsearch import *\n"],"metadata":{"colab":{"base_uri":"https://localhost:8080/"},"id":"semBM0KJEhMv","executionInfo":{"status":"ok","timestamp":1779816808842,"user_tz":-60,"elapsed":36,"user":{"displayName":"Brandon Bennett","userId":"09986949895077581770"}},"outputId":"b1439a03-0ef9-4a15-c9e1-6babb2ce7cd0"},"execution_count":11,"outputs":[{"output_type":"stream","name":"stdout","text":["Overwriting /content/drive/MyDrive/GIT-repos/bbqsearch/src/bbqsearch/__init__.py\n"]}]},{"cell_type":"code","source":["%%writefile /content/drive/MyDrive/GIT-repos/bbqsearch/README.md\n","# bbqsearch\n","\n","`bbqsearch` is a simple, configurable, queue-based search algorithm intended for AI teaching.\n","\n","**Status:** Experimental research and teaching tool.\n","\n","The package is designed primarily for use in interactive environments such as a Jupyter notebook\n","or in Google Colab, providing a simple interface for running Prover9 from Python\n","code and capturing the resulting proofs and diagnostic output.\n","\n","## Installation\n","\n","```bash\n","pip install bbqsearch\n","```"],"metadata":{"colab":{"base_uri":"https://localhost:8080/"},"id":"UTAimrKZE0-3","executionInfo":{"status":"ok","timestamp":1779816810071,"user_tz":-60,"elapsed":54,"user":{"displayName":"Brandon Bennett","userId":"09986949895077581770"}},"outputId":"05e1ca79-0c5f-41ac-d670-efa6db484f73"},"execution_count":12,"outputs":[{"output_type":"stream","name":"stdout","text":["Overwriting /content/drive/MyDrive/GIT-repos/bbqsearch/README.md\n"]}]}]}

bbqsearch-0.1.0/pyproject.toml

@@ -0,0 +1,27 @@
+[build-system]
+requires = ["hatchling>=1.25"]
+build-backend = "hatchling.build"
+
+[project]
+name = "bbqsearch"
+version = "0.1.0"
+description = "General configurable queue-based search algorithm for teaching AI."
+readme = "README.md"
+requires-python = ">=3.8"
+license = { text = "MIT" }
+keywords = ["search", "teaching"]
+
+authors = [
+  { name = "Brandon Bennett", email="B.Bennett@leeds.ac.uk" }
+]
+
+#[project.urls]
+#Homepage = "https://github.com/..."
+#Repository = "https://github.com/..."
+
+[tool.hatch.build]
+dev-mode-dirs = ["src"]
+
+[tool.hatch.build.targets.wheel]
+#sources = ["src"]
+packages = ["src/bbqsearch"]

bbqsearch-0.1.0/src/bbqsearch/__init__.py

@@ -0,0 +1 @@
+from .bbqsearch import *

bbqsearch-0.1.0/src/bbqsearch/bbqearch.py

@@ -0,0 +1,580 @@
+#!/usr/bin/env python
+# coding: utf-8
+
+# # bbSearch
+# 
+# This version of `bbSearch` written during January and February 2022.
+# 
+# 
+# ### My personal notes:
+# To install on cloud for download use shell script `publish-bbSearch`.
+
+# In[47]:
+
+
+#<<<
+#<<< def __MAKE_SCRIPT__(notebook_stem):
+#<<<     get_ipython().system( f' jupyter nbconvert --to python {notebook_stem}.ipynb')
+#<<<     with open( notebook_stem + ".py", "r") as f: 
+#<<<         lines = f.read().split('\n')      
+#<<<     new_lines = []
+#<<<     exclude = False
+#<<<     for l in lines:
+#<<<         if l.startswith("#<<<"):
+#<<<             exclude = True
+#<<<             new_lines.append(l)
+#<<<             continue
+#<<<         if l.startswith("#>>>"):
+#<<<             exclude = False
+#<<<             new_lines.append(l)
+#<<<             continue
+#<<<         if exclude:
+#<<<             new_lines.append("#<<< " + l)
+#<<<         else:
+#<<<             new_lines.append(l)
+#<<<             
+#<<<     new_content = '\n'.join(new_lines) 
+#<<<     #new_content = "### MODIFIED\n" + new_content
+#<<<     with open( notebook_stem + ".py", "w") as f:    
+#<<<         f.write(new_content) 
+#<<<    
+#<<< __MAKE_SCRIPT__("bbSearch")
+#<<< get_ipython().system('s3cmd put --acl-public bbSearch.py s3://bb-ai.net/bb-python-modules/')
+#>>>
+
+
+# In[34]:
+
+
+from datetime import datetime
+time = datetime.now().strftime("%H:%M, %a %d %b")
+print(f"Loading bbSearch Version 2.1 (at {time})")
+print("Last module source code edit 9am Thursday 24th Feb 2022")
+
+
+# In[35]:
+
+
+class SearchProblem:
+
+    def __init__( self ):
+        """
+        The __init__ method must set the initial state for the search.
+        Arguments could be added to __init__ and used to configure the
+        initial state and/or other aspects of a problem instance.
+        """
+        self.initial_state = None
+        raise NotImplementedError
+
+    def info(self):
+        """
+        This function is called when the search is stared and should
+        print out useful information about the problem.
+        """
+        print("This is the general SearchProblem parent class")
+        print("You must extend this class to encode a particular search problem.")
+
+    def possible_actions(self, state):
+        """
+        This takes a state as argument and must return a list of actions.
+        Both states and actions can be any kinds of python data type (e.g.
+        numbers, strings, tuples or complex objects of any class).
+        """
+        return []
+
+    def successor(self, state, action):
+        """
+        This takes a state and an action and returns the new state that would result
+        from doing that action in that state. You can assume that the given action
+        is in the list of 'possible_actions' for that state. 
+        """
+        return state
+
+    def goal_test(self, state):
+        """
+        This method shoudl return True or False given any state. It should return 
+        True for all and only those states that are considert "goal" states.
+        """
+        return False
+    
+    def cost(self, path, state):
+        """
+        This is an optional method that you only need to define if you are using
+        a cost based algorithm such as "uniform cost" or "A*". It should return
+        the cost of reaching a given state via a given path.
+        If this is not defined, it will is assumed that each action costs one unit
+        of effort to perform, so it returns the length of the path.
+        """
+        return len(path)
+    
+    def heuristic(self, state):
+        """
+        This is an optional method that should return a heuristic value for any
+        state. The value should be an estimate of the remaining cost that will be
+        required to reach a goal. For an "admissible" heuristic, the value should
+        always be equal to or less than the actual cost.
+        """
+        raise NotImplementedError
+
+    def display_action(self, action):
+        """
+        You can set the way an action will be displayed in outputs.
+        """
+        print("   ", action)
+
+    def display_state(self, state):
+        """
+        You can set the way a state will be displayed in outputs.
+        """
+        print(state)
+        
+    def display_state_path( self, actions ):
+        """
+        This defines output of a solution path when a list of actions
+        is applied to the initial state. It assumes it is a valid path
+        with all actions being possible in the preceeding state.
+        You probably don't need to override this.
+        """
+        s = self.initial_state
+        self.display_state(s)
+        for a in actions:
+            self.display_action(a)
+            s = self.successor(s,a)
+            self.display_state(s)
+
+
+# In[36]:
+
+
+class JugPouringPuzzle( SearchProblem ):
+    
+    def __init__( self, initial_state, goal_quantity ):
+        self.initial_state = initial_state
+        self.goal_quantity = goal_quantity
+        print( "Creating SearchProblem object" )
+        print( "Setting initial state to:", self.initial_state )
+        print( "Want to measure quantity:", self.goal_quantity )
+        
+        self.jugs = self.initial_state.keys()
+
+    def info(self):
+        print( "\nMeasuring Jugs problem:" )
+        print( "You have a number of jugs with a certain volume and initial contents,\n" 
+               "as follows:")
+        for jar in self.initial_state:
+          print(f"{jar:>10} : volume={self.initial_state[jar][0]}, "
+                          f"contents={self.initial_state[jar][1]}")
+        print( f"The goal is to measure the quantity {self.goal_quantity} "
+                "by pourning liquid between the jugs.")
+
+    def possible_actions(self, state):
+        actions = []
+        for j1 in self.jugs:
+            for j2 in self.jugs:
+                if ( j1!=j2  #different jugs
+                     and state[j1][1] > 0  # j1 not empty
+                     and state[j2][0]>state[j2][1] # j2 not full
+                   ): actions.append((j1,j2))
+        return actions
+                    
+    def successor(self, state, action):
+        new_state = { k:state[k] for k in state }
+        j1, j2 = action[0], action[1]
+        vol_in_j1 = state[j1][1]
+        vol_in_j2 = state[j2][1]
+        space_in_j2 = state[j2][0] - state[j2][1]
+        if vol_in_j1 <= space_in_j2:
+            new_j1 = 0
+            new_j2 = vol_in_j1 + vol_in_j2
+        else:
+            new_j1 = vol_in_j1 - space_in_j2
+            new_j2 = state[j2][0]
+        new_state[j1] = (state[j1][0], new_j1)
+        new_state[j2] = (state[j2][0], new_j2)
+        return new_state
+
+    def goal_test(self, state):
+        quantities = [ state[k][1] for k in state]
+        return  self.goal_quantity in quantities
+
+    def display_action( self, action ):
+        j1, j2 = action
+        print(f"Pour from {j1} to {j2}:")
+
+    def display_state( self, state ):
+        jug_quantities = [ f"{k} ({state[k][0]}): {state[k][1]}" for k in state]
+        print( ", ".join(jug_quantities))
+
+
+# In[37]:
+
+
+import bisect
+
+## This is a Weighted queue optimised by using the bisect module
+## to insert into the item list (via key indirection).
+
+class WeightedQueue:
+    
+    def __init__(self, mode='fifo', weighted=True, weightfunc=None ):
+        self.weighted = weighted
+        self.weightfunc = weightfunc
+        self.mode = mode
+        self.weights = []
+        self.items   = []
+        
+        if mode == 'fifo':
+            if self.weighted:
+                self.insert = self.insert_right
+                self.pop = self.pop_weighted
+            else:
+                self.insert = self.add_right
+        
+        elif mode == 'lifo':
+            if self.weighted:
+                self.insert = self.insert_left
+                self.pop = self.pop_weighted
+            else:
+                self.insert = self.add_left
+                
+ 
+        else:
+            raise ValueError("!!! WeightedQueue 'mode' keyword arg "
+                                  "must be 'fifo' or 'lifo'")
+        
+        
+    def add_left(self,item, weight=None):
+        self.items.insert(0,item)
+        
+    def add_right(self,item, weight=None):
+        self.items.append(item)
+
+    def insert_left(self, item, weight = None):
+        if weight == None:
+            weight = self.weightfunc(item)
+        ipoint = bisect.bisect_left(self.weights, weight)
+        bisect.insort_left(self.weights, weight)
+        self.items.insert(ipoint,item)
+        
+    def insert_right(self, item, weight = None):
+        if weight == None:
+            weight = self.weightfunc(item)
+        ipoint = bisect.bisect_right(self.weights, weight)
+        bisect.insort_right(self.weights, weight)
+        self.items.insert(ipoint,item)
+        
+    def initialise(self, items, weights=None):
+        self.items = items
+        if weights:
+            iwpairs = list(zip(items,weights))
+            iwpairs.sort(key=lambda x:x[1])
+            self.items   = [x[0] for x in iwpairs]
+            self.weights = [x[1] for x in iwpairs]
+        elif self.weightfunc:
+            self.items.sort(key=self.weightfunc)
+            self.weights = [self.weightfunc(i) for i in self.items]
+        
+    def pop(self):
+        return self.items.pop(0)
+    
+    def pop_weighted(self):
+        self.weights.pop(0)
+        return self.items.pop(0)
+    
+    def display(self):
+        for w, i in zip(self.weights, self.items):
+            print(f"{w}: {i}")
+    
+
+
+# In[44]:
+
+
+class SearchQueue:
+    
+    def __init__( self, mode='BF/FIFO', cost=None, heuristic=None ):
+        self.mod = mode
+        self.cost = cost
+        self.heuristic = heuristic
+        self.weighted = (cost!=None or heuristic!=None)
+
+        #mode parameter determines whether queue mode is filo or fifo
+        modemap = { 'BF/FIFO':'fifo',     'DF/LIFO': 'lifo',
+                    'bf'  :   'fifo',          'df': 'lifo', 
+                    'BF'  :   'fifo',          'DF': 'lifo', 
+                    'fifo':   'fifo',        'lifo': 'lifo',
+                    'FIFO':   'fifo',        'LIFO': 'lifo',
+           'breadth_first':   'fifo', 'depth_first': 'lifo',
+                  }
+        if not mode in modemap.keys():
+            raise ValueError("!!! SearchQueue 'mode' argument "
+                                  "must be 'BF/FIFO' or 'DF/LIFO'")
+        
+        self.wq = WeightedQueue(modemap[mode], weighted=self.weighted)
+                
+    def empty(self):
+        return self.wq.items == []
+    
+    def len(self):
+        return len(self.wq.items)
+    
+    def insert(self,item, weight=None):
+#         print("Insert in SearchQueue")
+#         print("item=", item)
+#         print("weight=", weight)
+        self.wq.insert(item, weight=weight)
+        
+    def initialise(self,items,weights=None):
+        return self.wq.initialise(items,weights=weights)
+        
+    def pop(self):
+        return self.wq.pop()
+    
+
+
+        
+#sq = SearchQueue()       
+
+
+# In[45]:
+
+
+import time, random
+
+def search( problem, 
+            mode, 
+            max_nodes,
+            loop_check       = False,
+            randomise        = False,
+            cost             = None,
+            heuristic        = None,
+            show_path        = True,
+            show_state_path  = False,
+            dots             = True,
+            return_info      = False,
+            #One could potentially define other node limits
+            #max_generated    = False,
+            #max_discarded    = False 
+          ):
+    
+    problem.info()
+    
+    print( "\n** Running Brandon's Search Algorithm **")
+    cost_name = (cost.__name__ if cost else None)
+    heuristic_name = (heuristic.__name__ if heuristic else None)
+    print( f"Strategy: mode={mode}, cost={cost_name}, heuristic={heuristic_name}")
+    print( f"Max search nodes: {max_nodes}  (max number added to queue)" ) 
+    
+    start_time = time.perf_counter()
+    queue = SearchQueue(mode,cost,heuristic)
+    queue.initialise( [([], problem.initial_state )], weights=[0] )
+    global weight_function
+    weight_function = node_weight_function( cost, heuristic )
+    
+    states_seen = {problem.initial_state.__repr__()}
+    nodes_generated = 1  # counting initial state
+    nodes_kept = 1
+    nodes_tested = 0
+    nodes_discarded = 0
+    
+    termination_condition = None
+    
+    node_limit_exceeded = False
+    
+    if not dots:
+        print( "Search started (progress dot output off)", flush=True)
+    
+    while True:
+        if queue.empty():
+            termination_condition = "SEARCH-SPACE_EXHAUSTED"  # Means there is no solution.
+            break
+        
+        if dots:
+            if nodes_tested % 1000 == 0:
+                if nodes_tested==0:
+                    print("Searching (will output '.' each 1000 goal_tests)", flush=True)
+                else:
+                    print('.', end='')
+                    if nodes_tested % 100000 == 0:
+                        print( f' ({nodes_tested})', flush=True)
+        
+        path, state = queue.pop()
+        nodes_tested += 1
+        if problem.goal_test(state):
+            termination_condition = "GOAL_STATE_FOUND"
+            break
+            
+        if node_limit_exceeded:
+            termination_condition = "NODE_LIMIT_EXCEEDED"
+            break
+        
+        #print("Considering state:", state)
+        actions = problem.possible_actions(state)
+        #print("Possible actions are:", actions)
+        
+        if randomise: # randomise action choice sequance (may be useful in DFS)
+            random.shuffle(actions)
+        
+        for i, a in enumerate(actions):
+            suc = problem.successor(state,a)
+            nodes_generated += 1
+            if loop_check:
+                if suc.__repr__() in states_seen:
+                    nodes_discarded += 1
+                    continue # skip already seen state
+                else:
+                    states_seen.add(suc.__repr__())
+            nodes_kept += 1
+            if nodes_kept > max_nodes:
+                node_limit_exceeded = True
+                break
+            extended_path = path+[a]
+            #print("Making node with path:", extended_path)
+            weight=weight_function(extended_path,suc)
+            #print("weight=", weight)
+            queue.insert((extended_path,suc), 
+                         weight=weight)
+              
+    if termination_condition == "GOAL_STATE_FOUND":
+        print( "\n:-)) *SUCCESS* ((-:\n" )
+        print( f"Path length = {len(path)}" )
+        print( "Goal state is:")
+        problem.display_state(state)
+        if cost != None:
+            print("Cost of reaching goal:", cost(path,state))
+        if show_path:
+            print( "The action path to the solution is:" )
+            for a in path:
+                problem.display_action(a)
+            print()
+        if show_state_path:
+            print( "The state/action path to the solution is:" )
+            problem.display_state_path(path)
+        goal_state = state
+        path_length = len(path)
+        
+    if termination_condition == "SEARCH-SPACE_EXHAUSTED":
+        print("\n!! Search space exhausted (tried everying) !!")
+        print("): No solution found :(\n")
+        goal_state=path=path_length=None
+        
+    if termination_condition == "NODE_LIMIT_EXCEEDED":
+        print( f"\n!! Search node limit ({max_nodes}) reached !!")
+        print("): No solution found :(\n")
+        goal_state=path=path_length=None
+
+    print( f"\nSEARCH SPACE STATS:")     
+    print( f"Total nodes generated          = {nodes_generated:>8}  (includes start)")
+    
+    if loop_check:
+        distinct_states_seen = len(states_seen)
+    else:
+        distinct_states_seen = "not recorded (loop_check=False)"
+    
+    if loop_check:
+        print( f"Nodes discarded by loop_check  = {nodes_discarded:>8}" 
+                f"  ({nodes_generated-nodes_discarded} distinct states added to queue)" )
+        #print( f"Distinct states seen  = {distinct_states_seen:>8}" )
+        
+    print( f"Nodes tested (by goal_test)    = {nodes_tested:>8}",end=' ' )
+    if termination_condition == "GOAL_STATE_FOUND":
+        print(f" ({nodes_tested-1} expanded + 1 goal)")
+    else:
+        print( " (all expanded)")
+        
+    print( f"Nodes left in queue            = {queue.len():>8}")
+    time_taken = time.perf_counter() - start_time
+    print( f"\nTime taken = {round(time_taken, 4)} seconds\n" )
+    
+    if not return_info:
+        return termination_condition
+    else:
+        return { 
+            "args" : {"problem" : problem.__class__.__name__,
+                          "mode" : mode,
+                     "max_nodes" : max_nodes,
+                    "loop_check" : loop_check,
+                     "randomise" : randomise,
+                          "cost" : cost_name,
+                     "heuristic" : heuristic_name,
+                         "dots"  : dots,
+                      },
+            "result": {
+                     "termination_condition": termination_condition,
+                     "goal_state"           : goal_state,
+                     "path"                 : path,
+                     "path_length"          : path_length,
+                      },
+            "search_stats" : {
+                 "nodes_generated"      : nodes_generated,
+                 "nodes_tested"         : nodes_tested,
+                 "nodes_discarded"      : nodes_discarded,
+                 "distinct_states_seen" : distinct_states_seen,
+                 "nodes_left_in_queue"  : queue.len(),
+                 "time_taken"           : time_taken,
+                 }
+           }
+    
+
+
+def node_weight_function( cost, heuristic ):    
+        if not cost and not heuristic:
+            return lambda p,s: None
+        if cost and (not heuristic):
+            return cost
+        if (not cost) and heuristic:
+            return lambda p,s: (heuristic(s))
+        if cost and heuristic:
+            return lambda p,s:(cost(p,s)+heuristic(s))
+            
+    
+
+
+# In[46]:
+
+
+def thecost(p,s):
+    return(len(p)**2)
+
+
+def test():
+    JPP1 = JugPouringPuzzle( 
+               {"small":(3,0), "medium":(5,0), "large":(8,8)}, #initial state
+               4   # goal measurement
+            )    
+
+    JPP2 = JugPouringPuzzle( 
+               {"small":(3,3), "medium":(5,0), "large":(8,8)}, #initial state
+               12   # goal measurement
+            )    
+
+
+    
+    res1 = search( JPP1, 'BF/FIFO', 10000, cost=thecost, loop_check=False, show_state_path=True )
+    print("res1 =");  display(res1)
+    res2 = search( JPP2, 'DF/LIFO', 10000, 
+                  #dots = False,
+                  randomise=True, loop_check=False, return_info=True)
+    print("res2 ="); display(res2)
+    
+if __name__ == "__main__":
+    test()
+
+
+# In[ ]:
+
+
+
+
+
+# In[ ]:
+
+
+
+
+
+# In[ ]:
+
+
+
+