From 4acdca9c43b71028f65769ccc6b45e772c95aafa Mon Sep 17 00:00:00 2001 From: "DavidCrompton1192@gmail.com" Date: Fri, 17 Mar 2023 22:03:15 -0400 Subject: [PATCH] Use SciHub Directly --- handyhelper/__init__.py | 12 ++--------- poetry.lock | 48 +++++++++++++++++++++++++++++++++++++++-- pyproject.toml | 1 + secrets/deploy.nix | 6 +++--- 4 files changed, 52 insertions(+), 15 deletions(-) diff --git a/handyhelper/__init__.py b/handyhelper/__init__.py index 371bc75..a53bd7a 100644 --- a/handyhelper/__init__.py +++ b/handyhelper/__init__.py @@ -7,20 +7,12 @@ import requests as req bot = commands.Bot() -user = os.environ["OPENSEARCH_USER"] -pswd = os.environ["OPENSEARCH_PASS"] - async def search(txt): - ses = req.Session() - ses.auth = (user, pswd) - - resp = ses.get("https://scihub.copernicus.eu/dhus/search", params = { - 'q': txt + resp = req.post("https://www.sci-hub.st/", data={ + 'request':txt }) return resp - - @bot.event async def on_ready(): diff --git a/poetry.lock b/poetry.lock index b2c56bd..3d6cd74 100644 --- a/poetry.lock +++ b/poetry.lock @@ -298,7 +298,7 @@ files = [ name = "colorama" version = "0.4.6" description = "Cross-platform colored terminal text." -category = "dev" +category = "main" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" files = [ @@ -619,6 +619,29 @@ docs = ["sphinx (==5.2.3)", "sphinxcontrib-websupport", "sphinxcontrib_trio (==1 speed = ["aiohttp[speedups]", "orjson (>=3.5.4)"] voice = ["PyNaCl (>=1.3.0,<1.5)"] +[[package]] +name = "openai" +version = "0.27.2" +description = "Python client library for the OpenAI API" +category = "main" +optional = false +python-versions = ">=3.7.1" +files = [ + {file = "openai-0.27.2-py3-none-any.whl", hash = "sha256:6df674cf257e9e0504f1fd191c333d3f6a2442b13218d0eccf06230eb24d320e"}, + {file = "openai-0.27.2.tar.gz", hash = "sha256:5869fdfa34b0ec66c39afa22f4a0fb83a135dff81f6505f52834c6ab3113f762"}, +] + +[package.dependencies] +aiohttp = "*" +requests = ">=2.20" +tqdm = "*" + +[package.extras] +datalib = ["numpy", "openpyxl (>=3.0.7)", "pandas (>=1.2.3)", "pandas-stubs (>=1.1.0.11)"] +dev = ["black (>=21.6b0,<22.0)", "pytest (>=6.0.0,<7.0.0)", "pytest-asyncio", "pytest-mock"] +embeddings = ["matplotlib", "numpy", "openpyxl (>=3.0.7)", "pandas (>=1.2.3)", "pandas-stubs (>=1.1.0.11)", "plotly", "scikit-learn (>=1.0.2)", "scipy", "tenacity (>=8.0.1)"] +wandb = ["numpy", "openpyxl (>=3.0.7)", "pandas (>=1.2.3)", "pandas-stubs (>=1.1.0.11)", "wandb"] + [[package]] name = "parso" version = "0.8.3" @@ -858,6 +881,27 @@ pure-eval = "*" [package.extras] tests = ["cython", "littleutils", "pygments", "pytest", "typeguard"] +[[package]] +name = "tqdm" +version = "4.65.0" +description = "Fast, Extensible Progress Meter" +category = "main" +optional = false +python-versions = ">=3.7" +files = [ + {file = "tqdm-4.65.0-py3-none-any.whl", hash = "sha256:c4f53a17fe37e132815abceec022631be8ffe1b9381c2e6e30aa70edc99e9671"}, + {file = "tqdm-4.65.0.tar.gz", hash = "sha256:1871fb68a86b8fb3b59ca4cdd3dcccbc7e6d613eeed31f4c332531977b89beb5"}, +] + +[package.dependencies] +colorama = {version = "*", markers = "platform_system == \"Windows\""} + +[package.extras] +dev = ["py-make (>=0.1.0)", "twine", "wheel"] +notebook = ["ipywidgets (>=6)"] +slack = ["slack-sdk"] +telegram = ["requests"] + [[package]] name = "traitlets" version = "5.9.0" @@ -1081,4 +1125,4 @@ multidict = ">=4.0" [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "92d541073d72547903239effa9d265802ef82c24f4207c0af3202e27d37954f6" +content-hash = "0430177a1a511ae2bf15ad52cb128b5f18ec59dd2462e0a6e9bf907426f45aa1" diff --git a/pyproject.toml b/pyproject.toml index d78af6f..2204bf4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,6 +13,7 @@ handyhelper = "handyhelper:main" python = "^3.10" requests = "^2.28.2" nextcord = "^2.4.1" +openai = "^0.27.2" [tool.poetry.group.dev.dependencies] ipython = "^8.11.0" diff --git a/secrets/deploy.nix b/secrets/deploy.nix index dcc4b43..12c6b59 100644 --- a/secrets/deploy.nix +++ b/secrets/deploy.nix @@ -1,5 +1,5 @@ { - "data": "ENC[AES256_GCM,data:ec4z0ubX6s5v/1z3Tjuvv7ef4nlkyPMj1YvJhUZVK1DpLwFTiaLk3Hpd/xfaFrktp/K3q2qG0oVwhdaVQ7GddDheo8+57rzv5fIw0dQbQi7WbtMheDL5G8kKzAHl/uVdto5wNLoY0EAD0pAw+9sOI83xeBIorS6LGlrX5r0QAsf+SuKRI6Md2E/AN2vr/L2I27BGjCg+IaKwU8geUCTIZ5hud9XIZRW37i193pDgVdA5sRSYtgQIbPcaNJ+ScedJmUA2EE+zUrRfT8Dwf2UnU2k0jkCEn0Gqg7Gp/nx3O58hi0XUGWLYtDpeKMf5PEzFbF4vZtIq7GpDvosmZXD8+6R0V1vtsCGRpzxeNTsby/zTywQ59lJa6PneGpcLcB1X72SuEwvMo/adIs+XTHnNm15MwKfhr4jYUVc8V1ekLXa/bMtk6smIdOiIjIxMOFM0/uswMDBqJOiUNztcP0G9Mhnmw6kH2/6R3uTYYUUi2RHbnAPnWaVALnOMQCifn5ecrmMI8l+574x3G4ulbRMxO77UME/p61SVslv5HNFlipCZLHC83kb7Wvpw7Vft8xPzTa3HvqJ6TmnwHNa1RZAzxE7y,iv:Js54yGJi2ecnwSFa2YJYQCQ+DLRNm+lr5HgXnAvqq04=,tag:vY6qcH/lyvCTl+28sWvtXg==,type:str]", + "data": "ENC[AES256_GCM,data:jLGfwTHJLm0+33OijRRT+l1B4N4mcwxjKj95rcclTf/+qh3fC5COt+PJnkVIfc4rlfraATjEk3OwWeEYabZmIhslpe1T6CP4dgRMQHDh4FXLIWmgu07XVFMWYdiOxxiTXiSy6X6K6C1OQ6EYTQb+werKk4CYBYtuD3xzr+sQswnxiLlpI0BOmxm3xCGAXDK/V/FKb3mA5LSHnXjxNARaLtZBcXDjU4mnJN95yUQyY89kaS6OQzo2TUA7Z04T4xvW5/uGZdtrYTlF4mK5Z9/fDnXNDsHM8rvrfLKvAv0ctN0Pj5Zr/Vex58Ofafb6qcuqwuAlNM8gct7OL7t4tBvBGtJ81LrMS+VeV5h2+0M2hFbPldLu+tcjgUso/FVwwrKD7gaxkF8Ev+CyZBGmPY7ANti8z0+jkpLdkwy758mem9IRIadWz27qaNqz4vdO68bp3C872/knYDPCD6av00p9fg4hPOTDFj2hiO0=,iv:NmaPl/ERtLLabR+65d6UbP7oUXax5R714WgxXolr9Ic=,tag:eS9m77L3K/IsCjrb42MqJQ==,type:str]", "sops": { "kms": null, "gcp_kms": null, @@ -15,8 +15,8 @@ "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtVWpxVTB3N2xpcXpDWlhI\naHM1TW9LL1FnT2lkRGF2bFM5VEVkNzRCV1djCkFqcmRLeWhYRkE0NzkvU00xcGdG\nYlpFOTlzWm9GS1BERi93QkxzOTJVN0EKLS0tIHpOYnlqMW9zaFpWaTJza2EzV1Jx\nOE1CUENlZlVKbGt6dUJUdUJuL1JmclkKFXf8F6bNDNDRpo+0X2MJKxAFls1vp/tr\n09dMExuNCHwJayKXlIL5+3OMDFTrjz49gZFQpWaOgQUbCVpI2Tff/A==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2023-03-18T01:26:25Z", - "mac": "ENC[AES256_GCM,data:Qbyo7pJXHY8BonrbtN/rQ73qM2zZooei9Qzuf6qiDYXrD1OT0bIwyDCEIk3P4G9iW/UaSUcZv+4qpAkIqHyMQRj6pSOmyXz6batNlrMA9gm/jqvr/a+ebhbaUKvJDTe5Pn18RJecTCKcrdGD7Fd0lNPcIvZFUmxfnPZ2zQZ4ORk=,iv:QgX5AA/OpOPOsSC5owp4TC7ZSuNlF1M/Tzwv3ee/iio=,tag:LU39uvP4STfdVRdNfNdAXw==,type:str]", + "lastmodified": "2023-03-18T01:49:54Z", + "mac": "ENC[AES256_GCM,data:iJLr2cw8KQuPSnngHeNy3LU/IEwOq77kNoOyaanQwu6yTz3IyqA7T6HKl94k264sazMjq6Gz5FE+dqM2wwabMEKrLmtoqrtic9GMKZfGyUlY5TcPrZrvS/+3V3To4DN3NIRmw4XFUm7aGHBN0MzXV681NhJZlbh3Qxh6ASwV7xs=,iv:TJD7FzHbmJNpV5gEdwIzmXu7Hqw4bzGQNUxZw+yZ2Vg=,tag:2EbL84mIMtO24oRd1YVEWQ==,type:str]", "pgp": null, "unencrypted_suffix": "_unencrypted", "version": "3.7.3"