Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
pycfhelpers
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cellframe
python-cellframe-modules
pycfhelpers
Commits
630df2fb
Commit
630df2fb
authored
1 year ago
by
Evgeniy Yurchenko
Browse files
Options
Downloads
Plain Diff
Merge branch 'Feature-10361' into 'main'
Feature 10361 See merge request
!4
parents
d3472953
210d50f0
No related branches found
Branches containing commit
No related tags found
1 merge request
!4
Feature 10361
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
node/cli.py
+3
-2
3 additions, 2 deletions
node/cli.py
node/http/simple.py
+14
-15
14 additions, 15 deletions
node/http/simple.py
node/logging.py
+1
-15
1 addition, 15 deletions
node/logging.py
node/net.py
+6
-7
6 additions, 7 deletions
node/net.py
with
24 additions
and
39 deletions
node/cli.py
+
3
−
2
View file @
630df2fb
from
typing
import
Callable
,
Protocol
from
typing
import
Callable
,
Protocol
,
NewType
import
traceback
import
traceback
from
CellFrame
import
AppCliServer
from
CellFrame
import
AppCliServer
from
DAP.Core
import
logIt
from
DAP.Core
import
logIt
from
optparse
import
OptionParser
from
optparse
import
OptionParser
from
pycfhelpers.node.types
import
ReplyId
ReplyId
=
NewType
(
"
ReplyId
"
,
int
)
class
ReplyObject
:
class
ReplyObject
:
...
...
This diff is collapsed.
Click to expand it.
node/http/simple.py
+
14
−
15
View file @
630df2fb
from
DAP.Core
import
AppContext
from
DAP.Core
import
AppContext
from
DAP.Network
import
Server
,
HttpSimple
,
HttpCode
from
DAP.Network
import
Server
,
HttpSimple
,
HttpCode
from
pycfhelpers.node.logging
import
CFLog
from
pycfhelpers.node.logging
import
CFLog
...
@@ -7,38 +6,38 @@ from typing import Callable
...
@@ -7,38 +6,38 @@ from typing import Callable
HTTP_REPLY_SIZE_MAX
=
10
*
1024
*
1024
HTTP_REPLY_SIZE_MAX
=
10
*
1024
*
1024
class
CFSimpleHTTPRequest
:
class
CFSimpleHTTPRequest
:
def
__init__
(
self
,
http
:
HttpSimple
):
def
__init__
(
self
,
http
:
HttpSimple
):
self
.
http
=
http
self
.
http
=
http
@property
@property
def
query
(
self
):
def
query
(
self
):
return
self
.
http
.
query
return
self
.
http
.
query
@property
@property
def
url
(
self
):
def
url
(
self
):
return
self
.
http
.
urlPath
return
self
.
http
.
urlPath
property
@
property
def
method
(
self
):
def
method
(
self
):
return
self
.
http
.
action
return
self
.
http
.
action
property
@
property
def
body
(
self
):
def
body
(
self
):
return
self
.
http
.
request
return
self
.
http
.
request
@property
@property
def
client_address
(
self
):
def
client_address
(
self
):
return
self
.
http
.
ipClient
return
self
.
http
.
ipClient
class
CFSimpleHTTPRequestHandler
:
def
__init__
(
self
,
methods
:
list
[
str
],
handler
:
Callable
[[
CFSimpleHTTPRequest
],
tuple
[
bytes
,
int
]]):
class
CFSimpleHTTPRequestHandler
:
def
__init__
(
self
,
methods
:
list
[
str
],
handler
:
Callable
[[
CFSimpleHTTPRequest
],
tuple
[
bytes
,
int
]]):
self
.
handler
=
handler
self
.
handler
=
handler
self
.
methods
=
methods
self
.
methods
=
methods
def
__call__
(
self
,
http
:
HttpSimple
,
response_code
:
HttpCode
):
def
__call__
(
self
,
http
:
HttpSimple
,
response_code
:
HttpCode
):
if
http
.
action
in
self
.
methods
:
if
http
.
action
in
self
.
methods
:
res
,
code
=
self
.
handler
(
CFSimpleHTTPRequest
(
http
))
res
,
code
=
self
.
handler
(
CFSimpleHTTPRequest
(
http
))
http
.
replyAdd
(
res
)
http
.
replyAdd
(
res
)
...
@@ -47,18 +46,18 @@ class CFSimpleHTTPRequestHandler:
...
@@ -47,18 +46,18 @@ class CFSimpleHTTPRequestHandler:
CFLog
.
notice
(
f
"
Method
{
http
.
action
}
not supported for
{
http
.
urlPath
}
"
)
CFLog
.
notice
(
f
"
Method
{
http
.
action
}
not supported for
{
http
.
urlPath
}
"
)
response_code
.
set
(
405
)
response_code
.
set
(
405
)
class
CFSimpleHTTPServer
:
class
CFSimpleHTTPServer
:
def
__init__
(
self
):
def
__init__
(
self
):
self
.
_sc
=
Server
()
self
.
_sc
=
Server
()
AppContext
.
getServer
(
self
.
_sc
)
AppContext
.
getServer
(
self
.
_sc
)
def
register_uri_handler
(
self
,
uri
:
str
,
handler
:
CFSimpleHTTPRequestHandler
):
def
register_uri_handler
(
self
,
uri
:
str
,
handler
:
CFSimpleHTTPRequestHandler
):
HttpSimple
.
addProc
(
self
.
_sc
,
uri
,
HTTP_REPLY_SIZE_MAX
,
handler
)
HttpSimple
.
addProc
(
self
.
_sc
,
uri
,
HTTP_REPLY_SIZE_MAX
,
handler
)
@staticmethod
@staticmethod
def
handler
(
uri
:
str
,
methods
:
list
[
str
]
=
[
"
GET
"
,
]
,
**
kwargs
):
def
handler
(
uri
:
str
,
methods
:
list
[
str
]
=
(
"
GET
"
,
)
,
**
kwargs
):
def
wrapper
(
func
):
def
wrapper
(
func
):
CFSimpleHTTPServer
().
register_uri_handler
(
uri
,
CFSimpleHTTPRequestHandler
(
methods
=
methods
,
handler
=
func
))
CFSimpleHTTPServer
().
register_uri_handler
(
uri
,
CFSimpleHTTPRequestHandler
(
methods
=
methods
,
handler
=
func
))
return
wrapper
return
wrapper
This diff is collapsed.
Click to expand it.
node/logging.py
+
1
−
15
View file @
630df2fb
from
DAP.Core
import
logIt
from
DAP.Core
import
logIt
class
CFLog
:
class
CFLog
:
def
__init__
(
self
):
def
__init__
(
self
):
self
.
_logger
=
logIt
self
.
_logger
=
logIt
...
@@ -30,18 +31,3 @@ class CFLog:
...
@@ -30,18 +31,3 @@ class CFLog:
def
critical
(
self
,
message
:
str
):
def
critical
(
self
,
message
:
str
):
self
.
_logger
.
critical
(
message
)
self
.
_logger
.
critical
(
message
)
def
dap
(
self
,
message
:
str
):
self
.
_logger
.
dap
(
message
)
def
warning
(
self
,
message
:
str
):
self
.
_logger
.
warning
(
message
)
def
att
(
self
,
message
:
str
):
self
.
_logger
.
att
(
message
)
def
error
(
self
,
message
:
str
):
self
.
_logger
.
error
(
message
)
def
critical
(
self
,
message
:
str
):
self
.
_logger
.
critical
(
message
)
\ No newline at end of file
This diff is collapsed.
Click to expand it.
node/net.py
+
6
−
7
View file @
630df2fb
from
typing
import
Iterator
,
Callable
,
Self
from
typing
import
Iterator
,
Callable
import
traceback
import
traceback
...
@@ -26,22 +26,21 @@ class NetFee:
...
@@ -26,22 +26,21 @@ class NetFee:
class
CFNet
:
class
CFNet
:
@staticmethod
def
active_nets
()
->
list
[
Self
]:
return
[
CFNet
(
n
.
getName
())
for
n
in
Net
.
getNets
()]
def
__init__
(
self
,
name
:
str
):
def
__init__
(
self
,
name
:
str
):
self
.
name
=
name
self
.
name
=
name
self
.
_origin_net
=
Net
.
byName
(
name
)
self
.
_origin_net
=
Net
.
byName
(
name
)
if
not
self
.
_origin_net
:
if
not
self
.
_origin_net
:
raise
RuntimeError
(
f
"
No such net:
{
name
}
"
)
raise
RuntimeError
(
f
"
No such net:
{
name
}
"
)
self
.
main
=
CFChain
(
self
,
'
main
'
)
self
.
main
=
CFChain
(
self
,
'
main
'
)
self
.
zerochain
=
CFChain
(
self
,
'
zerochain
'
)
self
.
zerochain
=
CFChain
(
self
,
'
zerochain
'
)
self
.
fee_data
=
NetFee
(
self
)
self
.
fee_data
=
NetFee
(
self
)
@staticmethod
def
active_nets
()
->
list
[
'
CFNet
'
]:
return
[
CFNet
(
n
.
getName
())
for
n
in
Net
.
getNets
()]
@property
@property
def
id
(
self
)
->
int
:
def
id
(
self
)
->
int
:
return
self
.
_origin_net
.
id
.
long
()
return
self
.
_origin_net
.
id
.
long
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment