From cefb9adab4a68d5a04893cc1be75fb6cce9980d6 Mon Sep 17 00:00:00 2001
From: cesar <cesaryuan@qq.com>
Date: Sun, 16 Jun 2024 23:19:50 +0800
Subject: [PATCH 1/2] Fix ModuleNotFoundError when running reqable script
directly
---
reqable/__init__.py | 2 +-
reqable/addons.py | 6 +++---
reqable/addons_mini.py | 6 +++---
reqable/main.py | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/reqable/__init__.py b/reqable/__init__.py
index f317161..d9242cf 100644
--- a/reqable/__init__.py
+++ b/reqable/__init__.py
@@ -1,4 +1,4 @@
-import main
+from reqable import main
if __name__== '__main__':
main.main()
\ No newline at end of file
diff --git a/reqable/addons.py b/reqable/addons.py
index 45d88aa..468e22f 100644
--- a/reqable/addons.py
+++ b/reqable/addons.py
@@ -1,8 +1,8 @@
# API Docs: https://reqable.com/docs/capture/addons
-from reqable import *
+from reqable.reqable import CaptureContext, CaptureHttpRequest, CaptureHttpResponse
-def onRequest(context, request):
+def onRequest(context: CaptureContext, request: CaptureHttpRequest) -> CaptureHttpRequest:
# Print url to console
# print('request url ' + context.url)
@@ -26,7 +26,7 @@ def onRequest(context, request):
# Done
return request
-def onResponse(context, response):
+def onResponse(context: CaptureContext, response: CaptureHttpResponse) -> CaptureHttpResponse:
# Update status code
# response.code = 404
diff --git a/reqable/addons_mini.py b/reqable/addons_mini.py
index e7a0446..eff3266 100644
--- a/reqable/addons_mini.py
+++ b/reqable/addons_mini.py
@@ -1,9 +1,9 @@
# API Docs: https://reqable.com/docs/capture/addons
-from reqable import *
+from reqable.reqable import CaptureContext, CaptureHttpRequest, CaptureHttpResponse
-def onRequest(context, request):
+def onRequest(context: CaptureContext, request: CaptureHttpRequest) -> CaptureHttpRequest:
return request
-def onResponse(context, response):
+def onResponse(context: CaptureContext, response: CaptureHttpResponse) -> CaptureHttpResponse:
return response
\ No newline at end of file
diff --git a/reqable/main.py b/reqable/main.py
index babcdd3..fe93435 100644
--- a/reqable/main.py
+++ b/reqable/main.py
@@ -1,7 +1,7 @@
import sys
import json
-from reqable import CaptureContext, CaptureHttpRequest, CaptureHttpResponse
-import addons
+from reqable.reqable import CaptureContext, CaptureHttpRequest, CaptureHttpResponse
+from reqable import addons
def main():
argv = sys.argv[1:]
From 74d9e06dd144400c951705f2002939ec0cab52fa Mon Sep 17 00:00:00 2001
From: cesar <cesaryuan@qq.com>
Date: Mon, 17 Jun 2024 00:02:10 +0800
Subject: [PATCH 2/2] Fix ModuleNotFoundError when running reqable script
directly
---
reqable/__init__.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/reqable/__init__.py b/reqable/__init__.py
index f317161..0dbeeda 100644
--- a/reqable/__init__.py
+++ b/reqable/__init__.py
@@ -1,4 +1 @@
-import main
-
-if __name__== '__main__':
- main.main()
\ No newline at end of file
+from reqable.reqable import *
\ No newline at end of file